Tim Gröger 19ff9db9df Merge branch 'feature/ldap' of 192.168.5.2:newgeruecht into feature/ldap ... Conflicts: geruecht/baruser/routes.py		2019-12-22 23:12:31 +01:00
..
baruser	Merge branch 'feature/ldap' of 192.168.5.2:newgeruecht into feature/ldap	2019-12-22 23:12:31 +01:00
controller	Merge branch 'feature/ldap' of 192.168.5.2:newgeruecht into feature/ldap	2019-12-22 23:12:31 +01:00
finanzer	fixed #79 and other bugs	2019-12-22 22:27:39 +01:00
model	fixed #79 and other bugs	2019-12-22 22:27:39 +01:00
__init__.py	fixed #79 and other bugs	2019-12-22 22:27:39 +01:00
routes.py	fixed #79 and other bugs	2019-12-22 22:27:39 +01:00
site.db	Task #60 erledigt.	2019-05-03 01:40:13 +02:00