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

..

assets

Add emoji autosuggest (#5053)

2017-09-23 14:47:32 +02:00

devise

Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845)

2018-03-20 19:41:51 +01:00

mastodon

Merge branch 'master' into glitch-soc/merge-upstream

2018-06-21 20:49:57 +02:00

paperclip

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-09 00:17:17 +00:00

tasks

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2018-06-07 05:13:49 -05:00

templates/haml/scaffold

Adding simple_form, adding profile settings, header image

2016-03-12 20:47:22 +01:00