Adam Shimali bfd7291426 resolve merge conflicts

2016-01-12 10:43:23 +00:00

..

app

resolve merge conflicts

2016-01-12 10:43:23 +00:00

__init__.py

Added a blank test

2015-11-18 16:52:43 +00:00

conftest.py

Fix for security hole with setting session['user_id'] before second factor of authentication has been authorised.

2016-01-07 12:43:10 +00:00