Merge Changes of the master repository

This commit is contained in:
igeligel committed 2016-10-24 15:32:32 +02:00
commit 750fa4f954
32 files changed
+1336 -137

No files matched your search

+5
View File
@@ -132,8 +132,13 @@
<module>aggregator-microservices</module>
<module>promise</module>
<module>page-object</module>
<<<<<<< HEAD
<module>object-mother</module>
</modules>
=======
<module>event-asynchronous</module>
</modules>
>>>>>>> refs/remotes/iluwatar/master
<dependencyManagement>
<dependencies>