David Yip f8e934f955 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: README.md		2018-03-12 17:52:19 -05:00
..
assets	Add emoji autosuggest (#5053)	2017-09-23 14:47:32 +02:00
devise	Fix #942: Seamless LDAP login (#6556)	2018-02-28 19:04:53 +01:00
json_ld	Use updated ActivityStreams context (added: sharedInbox) (#4764)	2017-09-02 14:00:58 +02:00
mastodon	Bump version to 2.3.1rc2	2018-03-12 12:48:49 +01: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 merge-upstream	2018-03-12 17:52:19 -05:00
templates/haml/scaffold	…