David Yip b28b405b97 Merge remote-tracking branch 'origin/master' into gs-master

2017-11-16 22:52:37 -06:00

..

assets

Add emoji autosuggest (#5053)

2017-09-23 14:47:32 +02:00

json_ld

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

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

mastodon

Remove empty strings (#5732)

2017-11-17 10:52:30 +09:00

paperclip

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

2017-10-26 09:18:27 -05:00

tasks

Add moderator role and add pundit policies for admin actions (#5635)

2017-11-11 20:23:33 +01:00

templates/haml/scaffold

Adding simple_form, adding profile settings, header image

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