Merge branch 'master' into ipad-fixes
authorLinda Nichols <lynnaloo@gmail.com>
Wed, 18 Dec 2013 16:13:50 +0000 (16:13 +0000)
committerLinda Nichols <lynnaloo@gmail.com>
Wed, 18 Dec 2013 16:13:50 +0000 (16:13 +0000)
commit16692c93083722bd6d449173c85be67a1a60f8e8
tree60407aec91766cc3b76ecf5a76f38030277f972e
parentb8bb2a8af18cd7bfd285f7ef42ee3dbb3d08974e
parent403f6e3f9462af02439c369156d78655b59a0b87
Merge branch 'master' into ipad-fixes
lib/enyo-x/source/app.js
lib/enyo-x/source/stylesheets/screen.css
lib/enyo-x/source/views/transaction_list_container.js