FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app
History
Thibaut Girka ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/models/user.rb

Resolved by adding :default_language to user settings fields
 		2018-06-21 20:49:57 +02:00
..
chewy
…
controllers Merge branch 'master' into glitch-soc/merge-upstream 2018-06-21 20:49:57 +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-21 20:49:57 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-06-21 20:49:57 +02:00
mailers
…
models Merge branch 'master' into glitch-soc/merge-upstream 2018-06-21 20:49:57 +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-21 20:49:57 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2018-06-21 20:49:57 +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-21 20:49:57 +02:00
workers Fix domain hiding logic (#7765) 2018-06-09 22:46:54 +02:00