Merge pull request #1127 from emanuelschuetze/readme

Updated README: Removed qrcode. Moved bootstrap.
This commit is contained in:
Norman Jäckel 2013-11-25 10:59:17 -08:00
commit 9c6981021e

View File

@ -242,6 +242,9 @@ OpenSlides uses the following projects or parts of them:
* `Bleach <https://github.com/jsocol/bleach/>`_, License: BSD * `Bleach <https://github.com/jsocol/bleach/>`_, License: BSD
* `Bootstrap <http://getbootstrap.com/2.3.2/>`_, License: Apache
License v2.0
* `CKEditor <http://ckeditor.com>`_, License: GPL, LGPL, MPL * `CKEditor <http://ckeditor.com>`_, License: GPL, LGPL, MPL
* `Django <https://www.djangoproject.com>`_, License: BSD * `Django <https://www.djangoproject.com>`_, License: BSD
@ -258,8 +261,6 @@ OpenSlides uses the following projects or parts of them:
* `Pillow <https://github.com/python-imaging/Pillow/>`_, License: Standard * `Pillow <https://github.com/python-imaging/Pillow/>`_, License: Standard
PIL License PIL License
* `qrcode <https://github.com/lincolnloop/python-qrcode/>`_, License: BSD
* `ReportLab <http://www.reportlab.com/software/opensource/rl-toolkit/>`_, * `ReportLab <http://www.reportlab.com/software/opensource/rl-toolkit/>`_,
License: BSD License: BSD
@ -277,9 +278,6 @@ OpenSlides uses the following projects or parts of them:
* `Tornado <http://www.tornadoweb.org/en/stable/>`_, License: Apache * `Tornado <http://www.tornadoweb.org/en/stable/>`_, License: Apache
License v2.0 License v2.0
* `Twitter Bootstrap <http://getbootstrap.com/2.3.2/>`_, License: Apache
License v2.0
* `Ubuntu TrueType Font <http://font.ubuntu.com>`_, License: Ubuntu Font * `Ubuntu TrueType Font <http://font.ubuntu.com>`_, License: Ubuntu Font
Licence 1.0 Licence 1.0