David Yip 071c2c9c85

Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
	app/javascript/styles/mastodon/components.scss

2018-01-20 10:45:43 -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

Bump version to 2.2.0rc1

2018-01-20 16:27:19 +01:00

paperclip

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

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

tasks

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-01-19 15:22:10 -06:00

templates/haml/scaffold

Adding simple_form, adding profile settings, header image

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