diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-20 18:08:23 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-20 18:08:23 +0300 |
| commit | 0e27c274f4f68f3385753a2482d881bae7c35a06 (patch) | |
| tree | 9193330053ce995462c9c735e9c43467d7a9b50e /test/config | |
| parent | ec3719f5391d6f9945cec2e36287049d72743cd4 (diff) | |
| parent | 5efa5b0c4a08c2bf73d6926ee7c418e31a04195c (diff) | |
| download | pleroma-0e27c274f4f68f3385753a2482d881bae7c35a06.tar.gz pleroma-0e27c274f4f68f3385753a2482d881bae7c35a06.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements
# Conflicts:
# test/web/mastodon_api/controllers/account_controller_test.exs
Diffstat (limited to 'test/config')
0 files changed, 0 insertions, 0 deletions