merge

2012-02-06 21:36:58 +01:00 · 2012-02-06 21:36:58 +01:00 · 3472563ea1
commit 3472563ea1
parent 8275484d84 baebf992ff
1 changed files with 5 additions and 1 deletions
--- a/4
+++ b/4
@ -3,6 +3,10 @@ THANKS file for OpenSlides

 OpenSlides uses parts of the following projects:

+* Django
+  <https://www.djangoproject.com/
+
+
 * Oxygen-Icons
  <http://www.oxygen-icons.org/>