• Egor NiKO's avatar
    Merge branch 'dev' · e9c67a61
    Egor NiKO authored
    Conflicts:
    	.gitignore
    	VERSION
    	includes/function.inc.php
    	index.php
    	vars.inc.php.exemple
    	xhr.php
    e9c67a61