summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarian Sigler <m@qjym.de>2012-09-21 02:50:05 +0200
committerMarian Sigler <m@qjym.de>2012-09-21 02:50:05 +0200
commit71ce07733bfbfac18e93dfd5fed3b8d513bf5158 (patch)
treee9b8ac54c937d0d8893c82e732e7e733b2d11de5
parentdb849d334158c277d730f01fb9424f92cd421d58 (diff)
parent9cef74c3eca6c18ddcb69ec0ab76aee60bb9c761 (diff)
downloadweb-71ce07733bfbfac18e93dfd5fed3b8d513bf5158.tar.gz
web-71ce07733bfbfac18e93dfd5fed3b8d513bf5158.tar.bz2
web-71ce07733bfbfac18e93dfd5fed3b8d513bf5158.zip
Merge branch 'master' of ssh://git.spline.de/account-web
-rw-r--r--contrib/munin/accounts.py (renamed from munin.py)0
-rw-r--r--requirements.txt1
2 files changed, 1 insertions, 0 deletions
diff --git a/munin.py b/contrib/munin/accounts.py
index 4215f68..4215f68 100644
--- a/munin.py
+++ b/contrib/munin/accounts.py
diff --git a/requirements.txt b/requirements.txt
index e0ad29e..164552f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,4 +3,5 @@ Flask-WTF
Werkzeug>=0.6
Jinja2>=2.4
WTForms>=1.0
+pycrypto
python-ldap