luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-18 21:03:27 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
Thibaut Girka db200226b8 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/javascript/mastodon/initial_state.js
	db/schema.rb

Upstream added a new field to initial_state.
Not too sure about what happened with db/schema.rb though…
2018-06-15 20:51:39 +02:00
..
chewy
controllers Merge branch 'master' into glitch-soc/merge-upstream 2018-06-15 20:51:39 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2018-05-19 22:41:10 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2018-06-15 20:51:39 +02:00
lib Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions 2018-06-12 18:13:30 -05:00
mailers
models Merge branch 'master' into glitch-soc/merge-upstream 2018-06-15 20:51:39 +02: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 branch 'master' into glitch-soc/merge-upstream 2018-06-15 20:51:39 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2018-06-15 20:51:39 +02:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2018-05-29 13:52:26 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2018-06-15 20:51:39 +02:00
workers Fix domain hiding logic (#7765) 2018-06-09 22:46:54 +02:00