You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		7 years ago
..
assets	Add emoji autosuggest (#5053)	7 years ago
devise	Fix #942: Seamless LDAP login (#6556)	7 years ago
json_ld	Use updated ActivityStreams context (added: sharedInbox) (#4764)	7 years ago
mastodon	Bump version to 2.3.0rc1	7 years ago
paperclip	Merge branch 'master' of https://github.com/tootsuite/mastodon	7 years ago
tasks	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
templates/haml/scaffold	Adding simple_form, adding profile settings, header image	9 years ago