Ondřej Hruška 0bf9261e65 Merge remote-tracking branch 'upstream/master'

2017-10-11 21:27:17 +02:00

..

assets

Add emoji autosuggest (#5053)

2017-09-23 14:47:32 +02:00

json_ld

Use updated ActivityStreams context (added: sharedInbox) (#4764)

2017-09-02 14:00:58 +02:00

mastodon

Fix #5329 (#5332)

2017-10-11 21:20:39 +02:00

paperclip

raise Mastodon::ValidationError if audio file duration is over 60 secs

2017-10-07 16:14:34 -07:00

tasks

Fix #5274 - Create symlink from public/500.html to public/assets/500.html (#5288)

2017-10-09 20:51:24 +02:00

templates/haml/scaffold

Adding simple_form, adding profile settings, header image

2016-03-12 20:47:22 +01:00