Albert Santoni
|
8b33acacd3
|
Merge branch 'saas-sessionoptimizations' into saas-3.x-sessionoptimizations
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/constants.php
airtime_mvc/application/controllers/LoginController.php
airtime_mvc/application/controllers/UserController.php
airtime_mvc/public/js/airtime/preferences/preferences.js
|
2015-09-29 18:58:55 -04:00 |
|