merge from dev

This commit is contained in:
Luke Pulverenti 2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions

View file

@ -4,7 +4,7 @@
<title>${TitlePlugins}</title>
</head>
<body>
<div id="addPluginPage" data-role="page" class="page type-interior pluginConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Plugins" data-require="scripts/registrationservices,scripts/ratingdialog,scripts/addpluginpage">
<div id="addPluginPage" data-role="page" class="page type-interior pluginConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Plugins" data-require="registrationservices,scripts/ratingdialog,scripts/addpluginpage">
<div data-role="content">
<div class="content-primary">
@ -55,7 +55,6 @@
</form>
<div class="premiumPackage" style="display: none; margin-top: 1.5em;">
<!--CORDOVA_EXCLUDE_START-->
<div>
<form name="_xclick" action="https://www.paypal.com/cgi-bin/webscr" method="post">
<p id="regStatus">
@ -96,7 +95,6 @@
</div>
</form>
</div>
<!--CORDOVA_EXCLUDE_END-->
</div>
</div>
</div>