Merge branch 'master' of https://github.com/friendica/friendica

[friendica.git] / js / main.js

diff --git a/js/main.js b/js/main.js
old mode 100755 (executable)
new mode 100644 (file)