Merge 2788b3b into 6b6185e

eventoL · Nov 10, 2018 · 8fda53b · 8fda53b
2 parents 6b6185e + 2788b3b
commit 8fda53b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/eventol/front/yarn.lock b/eventol/front/yarn.lock
@@ -4756,8 +4756,8 @@ merge-stream@^1.0.0:
     readable-stream "^2.0.1"
 
 merge@^1.1.3:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
 
 methods@~1.1.2:
   version "1.1.2"