David Yip d2cdc2b5a3

Merge remote-tracking branch 'origin/master' into gs-master

2018-03-27 10:44:12 -05: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

json_ld

Use updated ActivityStreams context (added: sharedInbox) (#4764)

2017-09-02 14:00:58 +02:00

mastodon

Fix UniqueUsernameValidator comparison (#6926)

2018-03-27 04:33:57 +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-03-27 10:44:12 -05:00

templates/haml/scaffold

Adding simple_form, adding profile settings, header image

2016-03-12 20:47:22 +01:00