Merge pull request #3536 from rrenkert/master

Locked bootstrap version (3.3.7). Added myself to AUTHORS.
2018-01-20 12:04:09 +01:00 · 2018-01-20 12:04:09 +01:00 · 9615149442
commit 9615149442
parent cfefd1c7b7 55503c4262
2 changed files with 2 additions and 0 deletions
--- a/1
+++ b/1
@ -26,3 +26,4 @@ Authors of OpenSlides in chronological order of first contribution:
    Thomas Junk <lilith2k3@archlinux.us>
    Meinert Leinigen <openslides@leinigen.cc>
    Andreas Engler <engel.a@web.de> (Russian translation)
+    Raimund Renkert <raimund@renkert.org>
--- a/bower.json
+++ b/bower.json
@ -2,6 +2,7 @@
  "name": "openslides",
  "private": true,
  "dependencies": {
+    "bootstrap": "~3.3.7",
    "jquery": "~3.1.0",
    "angular": "~1.5.8",
    "angular-animate": "~1.5.8",