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 6f54953c07 Merge remote-tracking branch 'upstream/master' into upstream-merge-again		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.0.0rc3	7 years ago
paperclip	raise Mastodon::ValidationError if audio file duration is over 60 secs	7 years ago
tasks	Fix #5274 - Create symlink from public/500.html to public/assets/500.html (#5288)	7 years ago
templates/haml/scaffold	Adding simple_form, adding profile settings, header image	9 years ago