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

# Conflicts:
#	application/views/mobile_first/ah-h1.php
hotfix/paypal-note
LiaoYijun 3 years ago
commit a3feb7d408

@ -37,7 +37,6 @@
<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-4231674166786366" <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-4231674166786366"
crossorigin="anonymous"></script> crossorigin="anonymous"></script>
<script>(adsbygoogle = window.adsbygoogle || []).push({});</script> <script>(adsbygoogle = window.adsbygoogle || []).push({});</script>
<?php } ?>
</div> </div>
<?php } ?>
Loading…
Cancel
Save