Merge pull request #3536 from rrenkert/master

Locked bootstrap version (3.3.7). Added myself to AUTHORS.
This commit is contained in:
Norman Jäckel 2018-01-20 12:04:09 +01:00 committed by GitHub
commit 9615149442
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions

View File

@ -26,3 +26,4 @@ Authors of OpenSlides in chronological order of first contribution:
Thomas Junk <lilith2k3@archlinux.us> Thomas Junk <lilith2k3@archlinux.us>
Meinert Leinigen <openslides@leinigen.cc> Meinert Leinigen <openslides@leinigen.cc>
Andreas Engler <engel.a@web.de> (Russian translation) Andreas Engler <engel.a@web.de> (Russian translation)
Raimund Renkert <raimund@renkert.org>

View File

@ -2,6 +2,7 @@
"name": "openslides", "name": "openslides",
"private": true, "private": true,
"dependencies": { "dependencies": {
"bootstrap": "~3.3.7",
"jquery": "~3.1.0", "jquery": "~3.1.0",
"angular": "~1.5.8", "angular": "~1.5.8",
"angular-animate": "~1.5.8", "angular-animate": "~1.5.8",