Olivia Mossberg 30da6440d0 Merge branch 'master' of github.com:tootsuite/mastodon ... It's just an upstream merge		2017-04-02 17:04:31 +02:00
..
assets	Merge branch 'master' of github.com:tootsuite/mastodon	2017-04-02 17:04:31 +02:00
controllers	Fix wording "show reblogs" -> "show boosts", order reports chronologically in	2017-04-02 16:45:49 +02:00
helpers	Fix style issue	2017-03-26 13:13:41 +02:00
lib	Fix issue with feed merge-in code as well	2017-04-02 15:58:25 +02:00
mailers
models	Paperclip will complain on its own if this variable is missing	2017-04-01 22:16:26 +02:00
services	Fix issue with feed merge-in code as well	2017-04-02 15:58:25 +02:00
views
workers