Merge branch 'master' into log-refactoring-1

Conflicts:
	core/Error.php

1 files changed, 2 insertions, 2 deletions

diff --git a/plugins/CoreConsole/Commands/DevelopmentSyncUITestScreenshots.php b/plugins/CoreConsole/Commands/DevelopmentSyncUITestScreenshots.php
index 987a434d93..f80864ad43 100644
--- a/plugins/CoreConsole/Commands/DevelopmentSyncUITestScreenshots.php
+++ b/plugins/CoreConsole/Commands/DevelopmentSyncUITestScreenshots.php
@@ -100,13 +100,13 @@ class DevelopmentSyncUITestScreenshots extends ConsoleCommand
         $output->writeln("If all downloaded screenshots are valid you may push them with these commands:");
         $output->writeln('');
         $commands = "cd tests/PHPUnit/UI/
-git add expected-ui-screenshots/
 git pull
+git add expected-ui-screenshots/
 git commit -m'' # WRITE A COMMIT MESSAGE
 git push
 cd ..
-git add UI
 git pull
+git add UI
 git commit -m'' #WRITE A COMMIT MESSAGE
 git push";
         $output->writeln($commands);