Martin Konecny
|
1bd07eeaca
|
Merge branch '2.1.x' into devel
Conflicts:
airtime_mvc/application/models/ServiceRegister.php
|
2012-07-17 15:00:53 -04:00 |
Vladimir
|
1e76845e9c
|
more sophisticated remote_addr determining
|
2012-07-17 13:34:48 -04:00 |
|
Martin Konecny
|
794cf2c845
|
CC-4090: Make code style PSR compliant
-run psr-cs-fixer
|
2012-07-15 21:17:13 -04:00 |
|
Martin Konecny
|
ee3447f903
|
CC-4090: Make code style PSR compliant
-User.php
-removed all trailing whitespace
|
2012-07-10 18:51:32 -04:00 |
martin
|
7dd14efe27
|
CC-2750: Ability to query health status for pypo,
liquidsoap, media monitor, and recorder
|
2011-10-04 15:49:02 -04:00 |