Merge branch 'master' of github.com:hainatravel/information-system

# Conflicts:
#	application/views/mobile_first/ah-lantern-form.php
master
黄文强@HWQ-PC 1 year ago
commit 688be20f80

@ -65,7 +65,7 @@
<label for="vip_heritage" style="font-size:18px;">
VIP Service+Shuttle Transfer+Dinner
<div class="selectionMemo">
US$109 (3900THB)
US$109
</div>
</label>
</div> -->

Loading…
Cancel
Save