Thibaut Girka ba7ee67498 Merge branch 'master' into glitch-soc/merge		2018-05-14 20:51:50 +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	2018-05-14 20:51:50 +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 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
templates/haml/scaffold