logaling/logaling-server [master] Merge branch 'master' into github-project-related-to-user (logaling-commit) - logaling

SHIMADA Koji	2012-09-25 21:06:57 +0900 (Tue, 25 Sep 2012)

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

  Merged d3e55cf: Merge pull request #15 from logaling/github-project-related-to-user

  Log:
    Merge branch 'master' into github-project-related-to-user
    
    Conflicts:
    	app/models/user.rb
    	app/views/dashboard/show.html.haml
    	db/schema.rb
-------------- next part --------------
An HTML attachment was scrubbed...
Télécharger

logaling

[logaling-commit] logaling/logaling-server [master] Merge branch 'master' into github-project-related-to-user