aboutsummaryrefslogtreecommitdiffstats
path: root/library/phpqrcode/tools/merge.sh
Commit message (Expand)AuthorAgeFilesLines
* remove all QR-code stuff from core - now in qrator addonredmatrix2015-06-251-2/+0
* qr code supportfriendica2014-01-071-0/+2