summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-07-31 11:38:45 -0300
committerTomás Touceda <chiiph@leap.se>2014-07-31 11:38:45 -0300
commit87869ff34efce43a331d238db64b768b616b129a (patch)
treea60bd2d5c3685b8f4b12c9f37c1ee063e028bc09 /tox.ini
parent602f1afc87ad78deea9412385598526783557ae2 (diff)
parent08d89399eb41261d796e8b35427354581c0c8f4a (diff)
Merge remote-tracking branch 'refs/remotes/ivan/bug/fix-system-logout-block' into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions