Marcin Kulik c4b5b16e6f Merge branch 'likes' ... * likes: Data model for "Like" Conflicts: app/models/user.rb db/schema.rb		2012-04-09 17:03:50 +02:00
..
migrate	Merge branch 'likes'	2012-04-09 17:03:50 +02:00
schema.rb	Merge branch 'likes'	2012-04-09 17:03:50 +02:00
seeds.rb	Fresh Rails 3.1 app with DM 1.2 and RSpec 2.7	2011-11-21 22:36:42 +01:00