summaryrefslogtreecommitdiff
authorMichael Krelin <hacker@klever.net>2014-03-19 22:08:01 (UTC)
committer Michael Krelin <hacker@klever.net>2014-03-19 22:08:01 (UTC)
commitd07d0f16c064ddf2f51fb506ea77000d2eebce71 (patch) (unidiff)
tree2754ad7e1a105f79420b905b93e6481ce3aaf085
parent603bcf8293434f4bb8c7435fa02a7fb435632d81 (diff)
parent56eb3a96f336d2c3db2604ff80c36d4041256ef7 (diff)
downloadclipperz-d07d0f16c064ddf2f51fb506ea77000d2eebce71.zip
clipperz-d07d0f16c064ddf2f51fb506ea77000d2eebce71.tar.gz
clipperz-d07d0f16c064ddf2f51fb506ea77000d2eebce71.tar.bz2
Merge remote-tracking branch 'github/master'
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--backend/php/properties/php.properties.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/backend/php/properties/php.properties.json b/backend/php/properties/php.properties.json
index 8c2ff05..c0eb8f2 100644
--- a/backend/php/properties/php.properties.json
+++ b/backend/php/properties/php.properties.json
@@ -1,5 +1,5 @@
1{ 1{
2 "request.path": "../index.php", 2 "request.path": "../index.php",
3 "dump.path": "/../dump.php", 3 "dump.path": "../dump.php",
4 "should.pay.toll": "false" 4 "should.pay.toll": "false"
5} 5}