Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-06-30

c57898aa · Nick Thomas · 7ffc1f89 · 074b1086 · c57898aa
Commit c57898aa authored Jun 30, 2017 by Nick Thomas
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

CHANGELOG-EE.md CHANGELOG-EE.md +0 -1

No files found.
--- a/CHANGELOG-EE.md
+++ b/CHANGELOG-EE.md
@@ -2,7 +2,6 @@ Please view this file on the master branch, on stable branches it's out of date.

 ## 9.3.3 (2017-06-30)

- No changes.
 - Add metrics to both remote and non remote mirroring. !2118
 - Forces import worker with mirror to insert mirror in front of queue. !2231
 - Fix locked and stale SSH keys file from 9.3.0 upgrade. !2240