From 4f0d5fd0ea50f888e33db54019348534fc8214e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <openslides@normanjaeckel.de>
Date: Mon, 21 Mar 2016 19:52:06 +0100
Subject: [PATCH] Updated bower and setup file.

---
 bower.json | 32 ++++++++++++++++----------------
 setup.py   |  1 -
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/bower.json b/bower.json
index a06f11ba8..79a1cd6b4 100644
--- a/bower.json
+++ b/bower.json
@@ -2,36 +2,36 @@
   "name": "OpenSlides",
   "private": true,
   "dependencies": {
-    "lodash": "~3.10.0",
-    "jquery": "~2.2.0",
-    "jquery.cookie": "~1.4.1",
-    "bootstrap-css-only": "~3.3.6",
     "angular": "~1.4.9",
-    "angular-messages": "~1.4.9",
     "angular-animate": "~1.4.9",
-    "angular-sanitize": "~1.4.9",
-    "angular-bootstrap": "~0.14.3",
     "angular-bootstrap-colorpicker": "~3.0.24",
+    "angular-bootstrap": "~0.14.3",
     "angular-chosen-localytics": "~1.3.0",
     "angular-csv-import": "~0.0.27",
     "angular-formly-templates-bootstrap": "~6.2.0",
     "angular-formly": "~7.3.9",
-    "angular-loading-bar": "~0.8.0",
-    "angular-ui-router": "~0.2.17",
-    "angular-ui-tree": "~2.5.0",
     "angular-gettext": "~2.2.0",
+    "angular-loading-bar": "~0.8.0",
+    "angular-messages": "~1.4.9",
+    "angular-pdf": "~1.3.0",
+    "angular-sanitize": "~1.4.9",
     "angular-scroll-glue": "~2.0.6",
-    "ngBootbox": "~0.1.3",
-    "ng-dialog": "~0.5.6",
-    "sockjs": "~0.3.4",
+    "angular-ui-router": "~0.2.17",
+    "angular-ui-tinymce": "~0.0.13",
+    "angular-ui-tree": "~2.5.0",
+    "bootstrap-css-only": "~3.3.6",
     "font-awesome-bower": "~4.5.0",
+    "jquery": "~2.2.0",
+    "jquery.cookie": "~1.4.1",
     "js-data": "~2.8.2",
     "js-data-angular": "~3.1.0",
+    "lodash": "~3.10.0",
+    "ng-dialog": "~0.5.6",
     "ng-file-upload": "~11.2.3",
-    "angular-ui-tinymce": "~0.0.13",
-    "angular-pdf": "~1.3.0",
-    "roboto-condensed": "~0.3.0",
+    "ngBootbox": "~0.1.3",
     "open-sans-fontface": "https://github.com/OpenSlides/open-sans.git#1.4.2.post1",
+    "roboto-condensed": "~0.3.0",
+    "sockjs": "~0.3.4",
     "tinymce-i18n": "OpenSlides/tinymce-i18n#a186ad61e0aa30fdf657e88f405f966d790f0805"
   },
   "overrides": {
diff --git a/setup.py b/setup.py
index b633ec783..9543b312f 100644
--- a/setup.py
+++ b/setup.py
@@ -31,7 +31,6 @@ setup(
         'Framework :: Django',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5', ],
     packages=find_packages(exclude=['tests', 'tests.*']),