Merge branch 'master' into old-ID

2015-04-09 14:39:49 -07:00
parent aef21bc4a9 e2865db2ea
commit 1d26dc2ac4
5 changed files with 134 additions and 16 deletions
@@ -197,6 +197,7 @@
        <js-module src="src/windows/InAppBrowserProxy.js" name="InAppBrowserProxy">
            <merges target="" />
        </js-module>
+        <asset src="www/inappbrowser.css" target="css/inappbrowser.css" />
    </platform>
  
    <!-- firefoxos -->