Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
7600067a300b650a6f30da19a469c913243f3a13
mastodon/app
History
David Yip 7600067a30 Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	app/controllers/follower_accounts_controller.rb
 	app/controllers/following_accounts_controller.rb
    	db/schema.rb
2018-05-04 14:16:30 -05:00
..
chewy
Full-text search for authorized statuses (#6423)
2018-02-09 23:04:47 +01:00
controllers
Merge remote-tracking branch 'origin/master' into gs-master
2018-05-04 14:16:30 -05:00
helpers
Merge remote-tracking branch 'origin/master' into gs-master
2018-05-03 17:23:44 -05:00
javascript
“Enable” high contrast theme
2018-05-04 17:50:11 +02:00
lib
Merge remote-tracking branch 'origin/master' into gs-master
2018-05-04 14:16:30 -05:00
mailers
Account archive download (#6460)
2018-02-21 23:21:32 +01:00
models
Merge remote-tracking branch 'origin/master' into gs-master
2018-05-04 14:16:30 -05:00
policies
Merge remote-tracking branch 'origin/master' into gs-master
2018-05-03 17:23:44 -05:00
presenters
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-05-04 18:17:32 +00:00
serializers
Merge remote-tracking branch 'origin/master' into gs-master
2018-05-04 14:16:30 -05:00
services
Merge remote-tracking branch 'origin/master' into gs-master
2018-05-03 17:23:44 -05:00
validators
Merge remote-tracking branch 'origin/master' into gs-master
2018-05-03 17:23:44 -05:00
views
Merge remote-tracking branch 'origin/master' into merge-upstream
2018-05-04 09:42:31 -05:00
workers
Fixes/do not override timestamps (#7336)
2018-05-03 23:02:46 +02:00