Merge branch 'master' of github.com:gorhill/uBlock

This commit is contained in:
Chris 2015-01-11 18:41:38 -07:00
commit b57d04231d
2 changed files with 2 additions and 0 deletions

View File

@ -0,0 +1 @@
/* Chromium: no platform-specific code */

View File

@ -44,6 +44,7 @@
<script src="js/vapi-common.js"></script> <script src="js/vapi-common.js"></script>
<script src="js/vapi-client.js"></script> <script src="js/vapi-client.js"></script>
<script src="js/vapi-popup.js"></script>
<script src="js/udom.js"></script> <script src="js/udom.js"></script>
<script src="js/i18n.js"></script> <script src="js/i18n.js"></script>
<script src="js/popup.js"></script> <script src="js/popup.js"></script>