application/views/Templates · 44b3c2cdf8d35e96f776320a7c3c9fab6e46f300 · TimeOut / TimeOutAdmin

Merge branch 'master' into 'amal' · 31087348

authored Feb 25, 2019

# Conflicts:
#   application/views/Event/eventAddForm.php
#   application/views/Event/eventEditForm.php
#   application/views/Event/viewEventList.php
#   application/views/Templates/header-script.php
#   application/views/Templates/left-menu.php

31087348

Name	Last commit	Last update
..
footer-script.php		Loading commit data...
footer.php		Loading commit data...
header-menu.php		Loading commit data...
header-script.php		Loading commit data...
left-menu.php		Loading commit data...