logaling/logaling-server [prioritize-the-search] Merge branch 'master' into enable-creating-user-glossary (logaling-commit) - logaling

SHIMADA Koji	2012-09-21 13:54:50 +0900 (Fri, 21 Sep 2012)

  New Revision: 2b4bd4796cd7cb5e5ac18c2b34a843b81899aab1
  https://github.com/logaling/logaling-server/commit/2b4bd4796cd7cb5e5ac18c2b34a843b81899aab1

  Merged c5d082c: Merge pull request #13 from logaling/enable-creating-user-glossary

  Log:
    Merge branch 'master' into enable-creating-user-glossary
    
    Conflicts:
    	Gemfile
-------------- next part --------------
An HTML attachment was scrubbed...
下載

logaling

[logaling-commit] logaling/logaling-server [prioritize-the-search] Merge branch 'master' into enable-creating-user-glossary