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 071c2c9c85 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss		7 years ago
..
assets	Add emoji autosuggest (#5053)	7 years ago
json_ld	Use updated ActivityStreams context (added: sharedInbox) (#4764)	7 years ago
mastodon	Bump version to 2.2.0rc1	7 years ago
paperclip	Merge remote-tracking branch 'origin/master' into gs-master	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