ufo / ufo-platform · Commits

Go to a project

Authored by mali
Commit 7502daaf897e4819d6e48ee921cd46db9d80f77d 1 parent 46278049

Merge branch 'test6.8.3' into gray 

Conflicts:
	order/src/main/java/com/yohoufo/order/service/proxy/InBoxFacade.java
Inline Side-by-side
Showing 1 changed file with 1 additions and 0 deletions
@@ -28,3 +28,4 @@ node_modules @@ -28,3 +28,4 @@ node_modules
28 .DS_Store 28 .DS_Store
29 coupon/src/main/java/META-INF/MANIFEST.MF 29 coupon/src/main/java/META-INF/MANIFEST.MF
30 resource/src/main/java/META-INF/MANIFEST.MF 30 resource/src/main/java/META-INF/MANIFEST.MF
  31 +searchword/.gitignore