Alexey Melnichuk 55318897f6 Merge branch 'master' into intercept_load_balance ... # Conflicts: # resources/install/scripts/resources/functions/database.lua		2015-10-25 09:34:19 +03:00
..
scripts	Merge branch 'master' into intercept_load_balance	2015-10-25 09:34:19 +03:00
sql	Remove the insert to v_settings as this is being done in app_defaults.php.	2015-08-03 09:32:48 -06:00