aboutsummaryrefslogtreecommitdiffstats
path: root/library/phpqrcode/tools/merge.sh
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-01-07 20:36:16 -0800
committerfriendica <info@friendica.com>2014-01-07 20:36:16 -0800
commit8b93881ce7ab4e0a8b0c8426da1ddfeed19c2309 (patch)
tree52d4b15d798933c068a8eb12374ac192db8fbb42 /library/phpqrcode/tools/merge.sh
parent401183780540812929e35a59348b7f2e347d4b8f (diff)
downloadvolse-hubzilla-8b93881ce7ab4e0a8b0c8426da1ddfeed19c2309.tar.gz
volse-hubzilla-8b93881ce7ab4e0a8b0c8426da1ddfeed19c2309.tar.bz2
volse-hubzilla-8b93881ce7ab4e0a8b0c8426da1ddfeed19c2309.zip
qr code support
Diffstat (limited to 'library/phpqrcode/tools/merge.sh')
-rw-r--r--library/phpqrcode/tools/merge.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/library/phpqrcode/tools/merge.sh b/library/phpqrcode/tools/merge.sh
new file mode 100644
index 000000000..e4c2fbcb8
--- /dev/null
+++ b/library/phpqrcode/tools/merge.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+php ./merge.php \ No newline at end of file