hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app
History
David Yip 67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 
Conflicts:
      app/javascript/mastodon/features/getting_started/index.js
      app/javascript/packs/public.js
      app/javascript/styles/components.scss
 		2017-09-09 23:56:21 -05:00
..
controllers Merge tag 'v1.6.0rc3' into sync/upstream 2017-09-09 14:28:08 -05:00
helpers Fix language filter codes (#4841) 2017-09-08 12:32:22 +02:00
javascript Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 2017-09-09 23:56:21 -05:00
lib Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 2017-09-09 23:56:21 -05:00
mailers Set default From address in config (#3756) 2017-07-07 00:12:12 +02:00
models Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 2017-09-09 23:56:21 -05:00
policies Add status destroy authorization to policy (#3453) 2017-05-30 22:56:31 +02:00
presenters Merge tag 'v1.6.0rc3' into sync/upstream 2017-09-09 14:28:08 -05:00
serializers Add script to make embedded iframes autosize (#4853) 2017-09-09 16:23:44 +02:00
services Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 2017-09-09 23:56:21 -05:00
validators Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
views Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 2017-09-09 23:56:21 -05:00
workers Switch to static URIs, new URI format in both protocols for new statuses (#4815) 2017-09-06 19:01:28 +02:00