summaryrefslogtreecommitdiff
path: root/lib/phpqrcode/tools/merge.sh
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2012-09-03 18:33:46 +0400
committerAndrew Dolgov <[email protected]>2012-09-03 18:33:46 +0400
commitfb70f26ed91dbd191351026d917afcef9d8d2eb1 (patch)
tree91f811cb0816f4804cbdb11015b6d145daba4bfa /lib/phpqrcode/tools/merge.sh
parentfd26d5bfdf1c79c340e81b52cf6b45814bdf2884 (diff)
implement one time passwords using TOTP
Diffstat (limited to 'lib/phpqrcode/tools/merge.sh')
-rw-r--r--lib/phpqrcode/tools/merge.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/phpqrcode/tools/merge.sh b/lib/phpqrcode/tools/merge.sh
new file mode 100644
index 000000000..e4c2fbcb8
--- /dev/null
+++ b/lib/phpqrcode/tools/merge.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+php ./merge.php \ No newline at end of file