Jonne Haß 0b15e66d06 Merge pull request #4577 from svbergerem/2302-permalink-comments ... [Ready to review & merge] Add permalinks for comments Conflicts: app/assets/stylesheets/application.css.sass		2014-01-22 11:24:42 +01:00
..
assets	Merge pull request #4577 from svbergerem/2302-permalink-comments	2014-01-22 11:24:42 +01:00
controllers	Merge pull request #4517 from Zauberstuhl/report_post_feature	2014-01-20 10:03:45 +01:00
helpers	Switched to using rails-timeago to make keeping on top of new versions of plugin easier	2014-01-20 09:33:35 +08:00
mailers	Added post report feature	2014-01-14 15:00:55 -05:00
models	Drop number of followers from tags page	2014-01-21 14:49:05 +01:00
presenters	Merge pull request #4612 from diaspora/drop_spv_old_code	2013-12-11 07:41:51 -08:00
uploaders	resize full scaled image to a specific width #3793	2013-01-26 11:36:01 +01:00
views	Drop number of followers from tags page	2014-01-21 14:49:05 +01:00
workers	Merge pull request #4517 from Zauberstuhl/report_post_feature	2014-01-20 10:03:45 +01:00