David Yip 1b8fcd4df5 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml		2018-03-02 21:46:44 -06:00
..
assets	Add emoji autosuggest (#5053)	2017-09-23 14:47:32 +02:00
devise	Fix #942: Seamless LDAP login (#6556)	2018-02-28 19:04:53 +01:00
json_ld	Use updated ActivityStreams context (added: sharedInbox) (#4764)	2017-09-02 14:00:58 +02:00
mastodon	Bump version to 2.3.0rc1	2018-03-01 20:50:23 +01:00
paperclip	Merge branch 'master' of https://github.com/tootsuite/mastodon	2018-02-23 23:28:31 +09:00
tasks	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-03-02 21:46:44 -06:00
templates/haml/scaffold	Adding simple_form, adding profile settings, header image	2016-03-12 20:47:22 +01:00