clipperz/password-manager-mirror
1
0
Fork 0
mirror of http://git.whoc.org.uk/git/password-manager.git synced 2024-11-14 07:59:02 +01:00
Code Issues Releases Wiki Activity

Merge branch 'buildFix' of https://github.com/jokajak/password-manager

Browse Source 
Conflicts:
	frontend/gamma/properties/gamma.properties.json
This commit is contained in:
Giulio Cesare Solaroli 2012-03-17 21:28:40 +00:00
commit 12cd9d47a6
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/python/properties/python.properties.json
View File

@ -1,8 +1,8 @@
{ {
"request.path": "clipperz.py", "request.path": "clipperz.py",
"should.pay.toll": "false" "should.pay.toll": "false",
"development.settings": { "development.settings": {
"url": "http://localhost/python/clipperz" "url": "http://localhost/python/clipperz"
} }
} }

5
frontend/beta/properties/beta.properties.json
View File

@ -183,5 +183,8 @@
"clipperz/clipperz.css", "clipperz/clipperz.css",
"clipperz/compact.css", "clipperz/compact.css",
"clipperz/ytheme-clipperz.css" "clipperz/ytheme-clipperz.css"
] ],
"html.template": "index_template.html"
} }

2
frontend/gamma/properties/gamma.properties.json
View File

@ -188,4 +188,4 @@
"css": [ "css": [
"web.css" "web.css"
] ]
} }