Mike Barnes 4401b3a148 Merge tag 'v2.5.0rc2' into HEAD		2018-09-02 09:01:33 +10:00
..
assets	Add emoji autosuggest (#5053)	2017-09-23 14:47:32 +02:00
devise	Fix wrong string being used on login failure when using LDAP (#8534)	2018-09-01 03:35:37 +02:00
generators	Add post-deployment migration system (#8182)	2018-08-13 13:40:01 +02:00
mastodon	Merge tag 'v2.5.0rc2' into HEAD	2018-09-02 09:01:33 +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