Merge branch 'master' into develop

This commit is contained in:
Pierre Rudloff 2016-10-02 20:15:47 +02:00
commit 8b1504fda9

View file

@ -14,7 +14,6 @@
<a href="https://github.com/Rudloff/alltube">Get the code</a> <a href="https://github.com/Rudloff/alltube">Get the code</a>
&middot; &middot;
Based on <a href="http://rg3.github.io/youtube-dl/">youtube-dl</a> Based on <a href="http://rg3.github.io/youtube-dl/">youtube-dl</a>
&middot;
</div> </div>
</footer> </footer>
<script src="{base_url|noscheme}/dist/main.js"></script> <script src="{base_url|noscheme}/dist/main.js"></script>