luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-09-18 16:10:57 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
David Yip 3ab6a8b8be
Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	spec/views/about/show.html.haml_spec.rb
2018-04-04 13:56:58 -05:00
..
chewy
controllers Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-04-03 19:17:20 +00:00
helpers Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-04-03 19:17:20 +00:00
javascript Merge remote-tracking branch 'origin/master' into gs-master 2018-04-04 13:56:58 -05:00
lib Merge remote-tracking branch 'origin/master' into gs-master 2018-04-01 20:24:50 -05:00
mailers
models Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-04-03 19:17:20 +00:00
policies Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-04-03 19:17:20 +00:00
presenters
serializers Merge remote-tracking branch 'origin/master' into gs-master 2018-04-01 20:24:50 -05:00
services Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-04-03 19:17:20 +00:00
validators Merge remote-tracking branch 'origin/master' into gs-master 2018-03-27 10:44:12 -05:00
views Merge remote-tracking branch 'origin/master' into gs-master 2018-04-04 13:56:58 -05:00
workers Validate HTTP response length while receiving (#6891) 2018-03-26 14:02:10 +02:00