Merge branch 'cocacola' into dev

ping
Commit 2871b974ed1f35afb674cc7dfb26ab4f35fa030a 2 parents bdc96c6d a0f8545d
Showing 3 changed files with 0 additions and 0 deletions
web/src/main/webapp/cocacola/gain.html → web/src/main/webapp/cocacola/html/gain.html
web/src/main/webapp/cocacola/index.html → web/src/main/webapp/cocacola/html/index.html
web/src/main/webapp/cocacola/index1.html → web/src/main/webapp/cocacola/html/index1.html
--- a/web/src/main/webapp/cocacola/gain.html → web/src/main/webapp/cocacola/html/gain.html
View file @2871b97
+++ b/web/src/main/webapp/cocacola/gain.html → web/src/main/webapp/cocacola/html/gain.html
View file @2871b97
--- a/web/src/main/webapp/cocacola/index.html → web/src/main/webapp/cocacola/html/index.html
View file @2871b97
+++ b/web/src/main/webapp/cocacola/index.html → web/src/main/webapp/cocacola/html/index.html
View file @2871b97
--- a/web/src/main/webapp/cocacola/index1.html → web/src/main/webapp/cocacola/html/index1.html
View file @2871b97
+++ b/web/src/main/webapp/cocacola/index1.html → web/src/main/webapp/cocacola/html/index1.html
View file @2871b97