Merge branch 'master' into captcha-login
authorRemixDev <deezloaderremix@gmail.com>
Wed, 10 Apr 2019 17:03:20 +0000 (19:03 +0200)
committerRemixDev <deezloaderremix@gmail.com>
Wed, 10 Apr 2019 17:03:20 +0000 (19:03 +0200)
1  2 
app/app.js
app/public/index.html
app/public/js/frontend.js

diff --cc app/app.js
Simple merge
Simple merge
Simple merge