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 /frontend/beta | |
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-- | frontend/beta/properties/beta.properties.json | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/frontend/beta/properties/beta.properties.json b/frontend/beta/properties/beta.properties.json index 476becd..810215b 100644 --- a/frontend/beta/properties/beta.properties.json +++ b/frontend/beta/properties/beta.properties.json | |||
@@ -162,26 +162,29 @@ | |||
162 | "Clipperz/PM/DataModel/DirectLogin.js", | 162 | "Clipperz/PM/DataModel/DirectLogin.js", |
163 | "Clipperz/PM/DataModel/DirectLoginReference.js", | 163 | "Clipperz/PM/DataModel/DirectLoginReference.js", |
164 | "Clipperz/PM/DataModel/DirectLoginInput.js", | 164 | "Clipperz/PM/DataModel/DirectLoginInput.js", |
165 | "Clipperz/PM/DataModel/DirectLoginBinding.js", | 165 | "Clipperz/PM/DataModel/DirectLoginBinding.js", |
166 | "Clipperz/PM/DataModel/OneTimePasswordManager.js", | 166 | "Clipperz/PM/DataModel/OneTimePasswordManager.js", |
167 | "Clipperz/PM/DataModel/OneTimePassword.js", | 167 | "Clipperz/PM/DataModel/OneTimePassword.js", |
168 | "Clipperz/YUI/IBLayoutManager.js", | 168 | "Clipperz/YUI/IBLayoutManager.js", |
169 | "Clipperz/YUI/IBLayoutRegion.js", | 169 | "Clipperz/YUI/IBLayoutRegion.js", |
170 | "Clipperz/YUI/Drawer.js", | 170 | "Clipperz/YUI/Drawer.js", |
171 | "Clipperz/YUI/Collapser.js", | 171 | "Clipperz/YUI/Collapser.js", |
172 | "Clipperz/YUI/MessageBox.js", | 172 | "Clipperz/YUI/MessageBox.js", |
173 | "Clipperz/YUI/DomHelper.js", | 173 | "Clipperz/YUI/DomHelper.js", |
174 | 174 | ||
175 | "Clipperz/PM/Main.js" | 175 | "Clipperz/PM/Main.js" |
176 | ], | 176 | ], |
177 | 177 | ||
178 | "css": [ | 178 | "css": [ |
179 | "yui-extensions/reset-min.css", | 179 | "yui-extensions/reset-min.css", |
180 | "yui-extensions/core.css", | 180 | "yui-extensions/core.css", |
181 | "yui-extensions/basic-dialog.css", | 181 | "yui-extensions/basic-dialog.css", |
182 | "yui-extensions/button.css", | 182 | "yui-extensions/button.css", |
183 | "clipperz/clipperz.css", | 183 | "clipperz/clipperz.css", |
184 | "clipperz/compact.css", | 184 | "clipperz/compact.css", |
185 | "clipperz/ytheme-clipperz.css" | 185 | "clipperz/ytheme-clipperz.css" |
186 | ] | 186 | ], |
187 | |||
188 | "html.template": "index_template.html" | ||
189 | |||
187 | } | 190 | } |