R11/release11-tools-mocked-services
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with modzeleg

Browse Source
This commit is contained in:
Gabriel Modzelewski
2021-02-18 16:16:53 +01:00
parent 4c78b0d31a c85f8b6693
commit 89c7f76f00
29 changed files with 117 additions and 1487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/workspace.xml generated
View File

@@ -29,7 +29,11 @@
<change beforePath="$PROJECT_DIR$/src/main/resources/templates/mock.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/mock.html" afterDir="false" />
=======
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<<<<<<< HEAD
<change beforePath="$PROJECT_DIR$/src/main/resources/static/js/datatransfer.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/datatransfer.js" afterDir="false" />
>>>>>>> modzeleg
=======
<change beforePath="$PROJECT_DIR$/src/main/resources/templates/mock.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/mock.html" afterDir="false" />
>>>>>>> modzeleg
</list>
<option name="SHOW_DIALOG" value="false" />
@@ -327,6 +331,10 @@
=======
<workItem from="1612868404302" duration="13841000" />
<workItem from="1613384221052" duration="5569000" />
<<<<<<< HEAD
>>>>>>> modzeleg
=======
<workItem from="1613557608694" duration="9724000" />
>>>>>>> modzeleg
</task>
<task id="LOCAL-00077" summary="testing jenkins docker">