fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-15 22:56:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app
History
David Yip 201e82686f
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
      app/javascript/styles/mastodon/components.scss
2018-01-17 18:37:09 -06:00
..
controllers Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-17 18:37:09 -06:00
helpers Merge remote-tracking branch 'origin/master' into gs-master 2018-01-15 22:17:48 -06:00
javascript Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-17 18:37:09 -06:00
lib Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-09 14:16:45 -06:00
mailers HTML e-mails for NotificationMailer (#6263) 2018-01-16 20:20:15 +01:00
models Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-15 06:17:15 +00:00
policies
presenters
serializers Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-17 16:17:10 +00:00
services Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-17 18:37:09 -06:00
validators
views Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-17 16:17:10 +00:00
workers Fix home regeneration (#6251) 2018-01-17 23:56:03 +01:00