Skip to content

Commit 068654e

Browse files
committed
Merge branch 'mike-marcacci-bracket_notation' into development
2 parents 9f15cf5 + 93ba0ed commit 068654e

23 files changed

+5375
-2304
lines changed

bower.json

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,14 @@
1313
"moduleType": [
1414
"globals"
1515
],
16-
"keywords": ["angular","angularjs","form","json","json-schema","schema"],
16+
"keywords": [
17+
"angular",
18+
"angularjs",
19+
"form",
20+
"json",
21+
"json-schema",
22+
"schema"
23+
],
1724
"license": "MIT",
1825
"ignore": [
1926
"**/.*",
@@ -23,11 +30,12 @@
2330
"coverage"
2431
],
2532
"dependencies": {
26-
"angular": "~1.2.18",
33+
"angular": "~1.3.0",
2734
"tv4": "~1.0.15",
2835
"pickadate": "~3.5.2",
29-
"angular-sanitize": "~1.2.18",
30-
"bootstrap-vertical-tabs": "~1.1.0"
36+
"angular-sanitize": "~1.3.0",
37+
"bootstrap-vertical-tabs": "~1.1.0",
38+
"objectpath": "~1.0.4"
3139
},
3240
"devDependencies": {
3341
"angular-ui-ace": "bower"

dist/bootstrap-datepicker.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)