[interchange: 2/2] Merge branch 'master' of ssh://git.icdevgroup.org/var/git/interchange

Mike Heins <[email protected]> Tue, 26 Jul 2016 17:12:49 +0000

Newsgroups	gmane.comp.web.interchange.cvs
Message-ID	<[email protected]>

commit 0031470f2ea9b98383622d0bee5341798901df83
Merge: 3bdebfc... a2c31f5...
Author: Mike Heins <[email protected]>
Date:   Tue Jul 26 13:10:31 2016 -0400

    Merge branch 'master' of ssh://git.icdevgroup.org/var/git/interchange

 .travis.yml                              |    1 +
 WHATSNEW-5.11                            |    7 ++
 code/UI_Tag/import_fields.coretag        |    1 -
 dist/lib/UI/pages/admin/entry.html       |    4 +-
 dist/strap/catalog.cfg                   |    2 +
 dist/strap/include/checkout/payment_info |    4 +-
 lib/Vend/Order.pm                        |   27 +++++----
 lib/Vend/Payment/Protx2.pm               |    1 +
 t/credit_cards.t                         |   95 ++++++++++++++++++++++++++++++
 9 files changed, 126 insertions(+), 16 deletions(-)
---