Thibaut Girka 5f1bdca4c8 Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream ... Merge upstream changes right before the public profile redesign.		2018-07-30 14:39:06 +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-07-11 17:57:08 +02:00
paperclip	Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream	2018-07-30 14:39:06 +02:00
tasks	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	2018-06-07 05:13:49 -05:00
templates/haml/scaffold