Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development

This commit is contained in:
Stephan Porada
2019-09-05 14:47:36 +02:00
14 changed files with 114 additions and 115 deletions

View File

@ -8,6 +8,9 @@ Flask-SQLAlchemy
Flask-Table
Flask-WTF
jsonpatch
<<<<<<< HEAD
psycopg2
python-dotenv
=======
>>>>>>> e3db2ecd1e52b4993b91e1a1c3501c0fc775de1d
redis