Code

Fix for #157#158

Code

Merged

ctran merged 5 commits intoctran:developctran/annotate_models:developfrom orbanbotond:developorbanbotond/annotate_models:developCopy head branch name to clipboardFeb 26, 2014

+6-3

Commits

Commits on Nov 29, 2013

• Merge branch 'release/2.6.0'

  

  Cuong Tran

  committed
  8c4f399

  Copy full SHA for 8c4f399

Commits on Dec 21, 2013

• Pump version to 2.6.1 which fixes ctran#22

  

  Cuong Tran

  committed
  3a83d9d

  Copy full SHA for 3a83d9d

• Merge branch 'release/2.6.1'

  

  Cuong Tran

  committed
  eb633bc

  Copy full SHA for eb633bc

Commits on Dec 27, 2013

• FIX ctran#157

  orbanbotond

  committed
  c3e75ee

  Copy full SHA for c3e75ee

• merge from origin gemspec

  orbanbotond

  committed
  4f5cc51

  Copy full SHA for 4f5cc51