Skip to content

Commit 4902000

Browse files
committed
Merge pull request #540 from Martii/Issue-379minimal
Update *bootstrap* dep to latest Auto-merg
2 parents 74a55f5 + 028898f commit 4902000

2 files changed

Lines changed: 1 addition & 2 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"async": "0.9.0",
99
"aws-sdk": "2.0.21",
1010
"body-parser": "1.10.1",
11-
"bootstrap": "3.1.1",
11+
"bootstrap": "3.3.1",
1212
"bootstrap-markdown": "2.8.0",
1313
"compression": "1.3.0",
1414
"connect-mongo": "0.6.0",

public/css/bootstrap-custom.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5146,7 +5146,6 @@ button.close {
51465146
right: 0;
51475147
bottom: 0;
51485148
left: 0;
5149-
z-index: 1040;
51505149
background-color: #000000;
51515150
}
51525151
.modal-backdrop.fade {

0 commit comments

Comments
 (0)