Ivan Tashkinov c8e7ace812 Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements ... # Conflicts: # CHANGELOG.md		2020-12-07 21:45:04 +03:00
..
credo/check/consistency	Move Consistency.FileLocation to ./test	2020-10-13 19:57:45 +02:00
fixtures	Fix badly formatted JSON fixtures which causes Jason to erroneously detect control characters	2020-11-23 14:48:14 -06:00
instance_static
mix	Merge branch 'feature/configdb-mix-tasks' into 'develop'	2020-12-07 18:06:06 +00:00
pleroma	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements	2020-12-07 21:45:04 +03:00
support	Use Jason instead of Poison in tests	2020-11-23 13:28:55 -06:00
test_helper.exs