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
..
assets	Fix handling of OSC seq terminated by ESC\	2012-04-09 12:55:07 +02:00
controllers	Comment#destroy instead of #delete	2012-04-09 16:33:29 +02:00
decorators	Markdown in comments	2012-04-06 23:46:44 +02:00
helpers	Get rid of jquery-linkify.js	2012-04-07 00:06:00 +02:00
mailers
models	Merge branch 'likes'	2012-04-09 17:03:50 +02:00
uploaders	Check code style with cane and tailor	2012-03-08 15:00:10 +01:00
views	Display comments count	2012-04-09 16:46:08 +02:00
workers	Thumbnail generation in Sidekiq worker	2012-04-06 20:53:04 +02:00