- 
# Conflicts: # frontend/views/site/contact.php # frontend/views/site/index.php 
- 
# Conflicts: # frontend/views/site/contact.php # frontend/views/site/index.php 
- 
- logo 
- 
bug fix1 
- 
bug fix 
- 
- edit comments 
- 
- delete about 
- 
- bug fix package 
- 
- bug fix package 
- 
- package 
 
