Mike Barnes c29f828897 Merge 2.5.0rc1 from upstream		2018-08-31 23:36:49 +10:00
..
assets	Add emoji autosuggest (#5053)	2017-09-23 14:47:32 +02:00
devise	Add ldap search filter (#8151)	2018-08-15 18:12:44 +02:00
generators	Add post-deployment migration system (#8182)	2018-08-13 13:40:01 +02:00
mastodon	Merge 2.5.0rc1 from upstream	2018-08-31 23:36:49 +10:00
paperclip	Resize images by area instead of fixed dimensions (#8083)	2018-07-28 03:33:00 +02:00
tasks	Fix low-hanging rubocop gripes (#8458)	2018-08-26 19:22:46 +02:00
templates	Add post-deployment migration system (#8182)	2018-08-13 13:40:01 +02:00
cli.rb	Add CLI task for rotating keys (#8466)	2018-08-26 20:21:03 +02:00