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
..
2017-07-18 16:38:22 +02:00
2017-11-18 00:16:48 +01:00
2017-06-19 11:31:37 +02:00
2017-06-19 11:30:27 +02:00
2017-06-19 01:38:50 +02:00
2017-11-18 00:16:48 +01:00
2017-11-27 16:07:59 +01:00
2017-11-18 00:16:48 +01:00
2017-11-18 00:16:48 +01:00
2017-04-05 00:29:56 +02:00