mirror of
http://git.whoc.org.uk/git/password-manager.git
synced 2025-10-24 09:17:35 +02:00
Merge branch 'buildFix' of https://github.com/jokajak/password-manager
Conflicts: frontend/gamma/properties/gamma.properties.json
This commit is contained in:
@@ -188,4 +188,4 @@
|
||||
"css": [
|
||||
"web.css"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user