• Moe's avatar
    Merge branch 'master' into 'dev' · d6f83fff
    Moe authored
    # Conflicts:
    #   languages/fr.json
    
    (and this is why we never do Merge Requests directly to the master branch.)
    d6f83fff
Name
Last commit
Last update
.gitlab/issue_templates Loading commit data...
INSTALL Loading commit data...
definitions Loading commit data...
languages Loading commit data...
libs Loading commit data...
plugins Loading commit data...
sql Loading commit data...
test Loading commit data...
tools Loading commit data...
web Loading commit data...
.gitattributes Loading commit data...
.gitignore Loading commit data...
.npmignore Loading commit data...
COPYING.md Loading commit data...
DEVELOPMENT.md Loading commit data...
INSTALL.md Loading commit data...
LICENSE.md Loading commit data...
README.md Loading commit data...
UPDATE.sh Loading commit data...
camera.js Loading commit data...
conf.sample.json Loading commit data...
cron.js Loading commit data...
package.json Loading commit data...
super.sample.json Loading commit data...