Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]>

# Conflicts:
#	config/version.php
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json

Author: snipe

config/version.php

@@ -1,10 +1,16 @@
 <?php
 return array (
-  'app_version' => 'v7.0.11',
-  'full_app_version' => 'v7.0.11 - build 15044-g46ed07642',
-  'build_version' => '15044',
+  'app_version' => 'v7.0.12',
+  'full_app_version' => 'v7.0.12 - build 15249-g713bb104e',
+  'build_version' => '15249',
   'prerelease_version' => '',
+<<<<<<< HEAD
   'hash_version' => 'g46ed07642',
   'full_hash' => 'v7.0.11-133-g46ed07642',
   'branch' => 'master',
+=======
+  'hash_version' => 'g713bb104e',
+  'full_hash' => 'v7.0.12-338-g713bb104e',
+  'branch' => 'develop',
+>>>>>>> origin/develop
 );