From 4b370bab80b618c469420854076f779ec95e01f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Artur=20St=C4=99pie=C5=84?= Date: Mon, 26 Feb 2018 19:27:59 +0100 Subject: [PATCH] Merge origin/dev Conflicts: composer.json --- api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api.php b/api.php index 0c0a430..ab94d1a 100644 --- a/api.php +++ b/api.php @@ -1,7 +1,7 @@