Merge branch 'chores/bump-copyright-year' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Wed, 18 Sep 2019 21:57:49 +0000 (21:57 +0000)
committerrinpatch <rinpatch@sdf.org>
Wed, 18 Sep 2019 21:57:49 +0000 (21:57 +0000)
Bump copyright years of files changed in 2019

See merge request pleroma/pleroma!1698

1  2 
test/object_test.exs
test/support/http_request_mock.ex
test/test_helper.exs
test/web/admin_api/admin_api_controller_test.exs
test/web/mastodon_api/views/account_view_test.exs

Simple merge
Simple merge
Simple merge