IT4Change/ohmyform
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged

Browse Source
This commit is contained in:
David Baldwynn 2015-07-28 16:08:58 -07:00
commit df4c4ad943
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bower.json
View File

@ -11,10 +11,17 @@
"appPath": "public/modules",
"dependencies": {
"bootstrap": "~3",
<<<<<<< HEAD
"angular": "~1.4.3",
"angular-resource": "~1.4",
"angular-animate": "~1.4",
"angular-mocks": "~1.4",
=======
"angular": "~1.3.17",
"angular-resource": "~1.2",
"angular-animate": "~1.2",
"angular-mocks": "~1.2",
>>>>>>> 2ed3023af99cc1b9a87f80f50d814a41c41f48f4
"angular-bootstrap": "~0.12.0",
"angular-ui-utils": "~0.1.1",
"angular-ui-router": "~0.2.11",

7
public/dist/application.min.js vendored
View File

File diff suppressed because one or more lines are too long