Thibaut Girka 55edfd6e0e Merge branch 'master' into glitch-soc/merge-upstream		2018-11-27 15:10:58 +01:00
..
assets	Add emoji autosuggest (#5053)	2017-09-23 14:47:32 +02:00
devise	Fix wrong string being used on login failure when using LDAP (#8534)	2018-09-01 03:35:37 +02:00
generators	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-27 15:10:58 +01:00
paperclip	…
tasks	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-05 15:23:57 +02:00
templates	…
cli.rb	Do not remove "dead" domains in tootctl accounts cull (#9108)	2018-10-27 22:56:16 +02:00