Adam Shimali bfd7291426 resolve merge conflicts

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

..

assets

Add a WTForms-compatible textbox macro

2016-01-11 15:20:00 +00:00

main

resolve merge conflicts

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

notify_client

Updated generate_token to use encrypt the entire url.

2016-01-11 15:18:37 +00:00

status

…

templates

resolve merge conflicts

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

__init__.py

…

its_dangerous_session.py

…

models.py

…

proxy_fix.py

…