| author | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2012-03-17 21:28:40 (UTC) |
|---|---|---|
| committer | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2012-03-17 21:28:40 (UTC) |
| commit | 12cd9d47a6e1c8f8dad28d53a261412218ace6d3 (patch) (unidiff) | |
| tree | 42fe98603849248c0d3943fd1d79135a734811c9 /backend | |
| parent | 25029b943781850c76fbf43827af0204f35a98bf (diff) | |
| parent | d791e1df1f701c1fe523f05a8521c4ad1cf032b5 (diff) | |
| download | clipperz-12cd9d47a6e1c8f8dad28d53a261412218ace6d3.zip clipperz-12cd9d47a6e1c8f8dad28d53a261412218ace6d3.tar.gz clipperz-12cd9d47a6e1c8f8dad28d53a261412218ace6d3.tar.bz2 | |
Merge branch 'buildFix' of https://github.com/jokajak/password-manager
Conflicts:
frontend/gamma/properties/gamma.properties.json
| -rw-r--r-- | backend/python/properties/python.properties.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backend/python/properties/python.properties.json b/backend/python/properties/python.properties.json index 128c98e..8dd872f 100644 --- a/backend/python/properties/python.properties.json +++ b/backend/python/properties/python.properties.json | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | { | 1 | { |
| 2 | "request.path": "clipperz.py", | 2 | "request.path": "clipperz.py", |
| 3 | "should.pay.toll": "false" | 3 | "should.pay.toll": "false", |
| 4 | 4 | ||
| 5 | "development.settings": { | 5 | "development.settings": { |
| 6 | "url": "http://localhost/python/clipperz" | 6 | "url": "http://localhost/python/clipperz" |
| 7 | } | 7 | } |
| 8 | } \ No newline at end of file | 8 | } |