From: Roman Bazalevskiy Date: Sat, 3 Sep 2016 18:32:52 +0000 (+0300) Subject: Merge branch 'master' of estia:weathermon X-Git-Url: https://git.rvb.name/weathermon.git/commitdiff_plain/a26fd989812acc9c3b91360a12a2685589acd942?hp=--cc Merge branch 'master' of estia:weathermon --- a26fd989812acc9c3b91360a12a2685589acd942 diff --cc web/config_local.php index eef2134,9ec56a8..d6cce97 --- a/web/config_local.php +++ b/web/config_local.php @@@ -1,9 -1,9 +1,9 @@@