From: Gil Moskowitz <gmoskowitz@xtuple.com>
Date: Mon, 22 Sep 2014 16:30:30 +0000 (-0400)
Subject: Merge pull request #1835 from shackbarth/23257-qr-final
X-Git-Tag: v4.7.0-beta.2~7
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=4c9d894d9f8bf4d3f2d0457288c596c50bdb5f8f;hp=-c;p=xtuple

Merge pull request #1835 from shackbarth/23257-qr-final

issue #23257: qr codes on fluentreports
---

4c9d894d9f8bf4d3f2d0457288c596c50bdb5f8f
diff --combined package.json
index eebc2ec20,cf61b6811..d848338e7
--- a/package.json
+++ b/package.json
@@@ -2,7 -2,7 +2,7 @@@
    "author": "xTuple <dev@xtuple.com>",
    "name": "xtuple",
    "description": "xTuple Enterprise Resource Planning Mobile-Web client",
 -  "version": "4.7.0-beta",
 +  "version": "4.7.0",
    "repository": {
      "type": "git",
      "url": "https://github.com/xtuple/xtuple.git"
@@@ -36,6 -36,7 +36,7 @@@
      "passport-oauth2-jwt-bearer": "0.1.x",
      "paynode": "0.3.6",
      "pg": "0.14.x",
+     "qr-image": "1.1.x",
      "request": "2.14.x",
      "rimraf": "2.2.x",
      "rjson": "~0.2.4",