wubb 8 years ago
parent
commit
8e5cdddd06

+ 5 - 0
src/main/webapp/WEB-INF/views/portal/activity/details.html

@@ -56,7 +56,12 @@
 		</div>
 		<div class="container activity_details">
 			<div class="activity_details_img">
+<<<<<<< HEAD
 				<img th:src="${portalHost +'/img/activity_details_img.png'}">
+=======
+				<img
+					th:src="${portalHost +'/img/activity_details_img.jpg'}">
+>>>>>>> 44881295eebc923e2703e39d4ce365e48330edba
 			</div>
 			<div class="activity_details_content">
 				<ul>

File diff suppressed because it is too large
+ 19 - 19
src/main/webapp/WEB-INF/views/portal/index.html


File diff suppressed because it is too large
+ 6 - 11
src/main/webapp/WEB-INF/views/portal/international/internationalIndex.html