summaryrefslogtreecommitdiff
path: root/backend
authorGiulio Cesare Solaroli <giulio.cesare@clipperz.com>2012-03-17 14:40:38 (UTC)
committer Giulio Cesare Solaroli <giulio.cesare@clipperz.com>2012-03-17 14:40:38 (UTC)
commite61e994abb9738d98447b203b9908793da6f560a (patch) (unidiff)
treec12d695420bb6281708b367d52970eac5615ef1c /backend
parent65a7a7be3feb846d6b1062a0b858a7660e8f99fa (diff)
parent24f7bfcbe317fe9f0d7de7cef3cb3b3b341c95a5 (diff)
downloadclipperz-e61e994abb9738d98447b203b9908793da6f560a.zip
clipperz-e61e994abb9738d98447b203b9908793da6f560a.tar.gz
clipperz-e61e994abb9738d98447b203b9908793da6f560a.tar.bz2
Merge branch 'buildScript' of https://github.com/jokajak/password-manager
Conflicts: scripts/builder/repository.py Signed-off-by: Giulio Cesare Solaroli <giulio.cesare@clipperz.com>
Diffstat (limited to 'backend') (more/less context) (ignore whitespace changes)
-rw-r--r--backend/php/properties/php.properties.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/backend/php/properties/php.properties.json b/backend/php/properties/php.properties.json
index 8ce703a..dd25b09 100644
--- a/backend/php/properties/php.properties.json
+++ b/backend/php/properties/php.properties.json
@@ -1,9 +1,9 @@
1{ 1{
2 "request.path": "index.php", 2 "request.path": "index.php",
3 "should.pay.toll": "false" 3 "should.pay.toll": "false",
4 4
5 "development.settings": { 5 "development.settings": {
6 "url": "http://localhost/php/clipperz" 6 "url": "http://localhost/php/clipperz"
7 } 7 }
8 8
9} \ No newline at end of file 9}