Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ...

Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml

2018-05-10 00:03:28 +02:00

..

bookmarks_controller.rb

Add backend support for bookmarks

2018-04-11 20:40:29 +02:00

favourited_by_accounts_controller.rb

Fix unpermitted parameters warning when generating pagination URLs (#6995)

2018-04-02 02:09:50 +02:00

favourites_controller.rb

Fix response of unreblog/unfavourite APIs (#4204)

2017-07-14 20:44:53 +02:00

mutes_controller.rb

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +02:00

pins_controller.rb

Fix distribute_add_activity and distribute_remove_activity (#7393)

2018-05-07 09:30:18 +02:00

reblogged_by_accounts_controller.rb

Fix unpermitted parameters warning when generating pagination URLs (#6995)

2018-04-02 02:09:50 +02:00

reblogs_controller.rb

Fix response of unreblog/unfavourite APIs (#4204)

2017-07-14 20:44:53 +02:00