aboutsummaryrefslogtreecommitdiffstats
path: root/library/phpqrcode/tools/merge.sh
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-25 19:05:49 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-25 19:05:49 -0700
commit70975dda4ae5237914b510ee61559fc8233ab34d (patch)
tree993b00bbfb51c3170bd2671962da09319bce0244 /library/phpqrcode/tools/merge.sh
parentb06b6f798fbfde8ab7f0ed25145b53560e6b4968 (diff)
downloadvolse-hubzilla-70975dda4ae5237914b510ee61559fc8233ab34d.tar.gz
volse-hubzilla-70975dda4ae5237914b510ee61559fc8233ab34d.tar.bz2
volse-hubzilla-70975dda4ae5237914b510ee61559fc8233ab34d.zip
remove all QR-code stuff from core - now in qrator addon
Diffstat (limited to 'library/phpqrcode/tools/merge.sh')
-rw-r--r--library/phpqrcode/tools/merge.sh2
1 files changed, 0 insertions, 2 deletions
diff --git a/library/phpqrcode/tools/merge.sh b/library/phpqrcode/tools/merge.sh
deleted file mode 100644
index e4c2fbcb8..000000000
--- a/library/phpqrcode/tools/merge.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-php ./merge.php \ No newline at end of file