Merge branch 'tokenauth'

Conflicts:
	test.db
This commit is contained in:
yackob03 2013-10-17 16:52:26 -04:00
commit 4f0dced8e7
12 changed files with 507 additions and 118 deletions

View file

@ -37,7 +37,7 @@
</div>
</div>
<div id="clipboardCopied" style="display: none">
<div id="clipboardCopied" class="hovering" style="display: none">
Copied to clipboard
</div>
</div>