djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-28 02:50:14 -05:00
Code Issues Packages Projects Releases Wiki Activity
ab5f450700
tootlab-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 Full-text search for authorized statuses (#6423) 2018-02-09 23:04:47 +01:00
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 Account archive download (#6460) 2018-02-21 23:21:32 +01:00
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