Thibaut Girka 6f0f583abe Merge branch 'master' into glitch-soc/merge-upstream		2018-07-11 17:57:08 +02:00
..
assets
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-07-11 17:57:08 +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