Merge branch 'maint-1.1'
- maint-1.1: WebStyle: dumb page loading fix WebStyle: new /ping handler
Conflicts:
modules/webstyle/lib/webinterface_layout.py
Description
Description
Details
Details
- Committed
Tibor Simko <tibor.simko@cern.ch> Dec 13 2012, 18:18 - Parents
- R3600:b3208860a44c: Merge branch 'maint-1.0' into maint-1.1
R3600:9e65829e07b2: Merge branch 'maint-1.1' - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| b3208860a44c | Tibor Simko | Merge branch 'maint-1.0' into maint-1.1 | Dec 13 2012 | |||
| 7b75a97bdd71 | Tibor Simko | WebStyle: dumb page loading fix | Dec 13 2012 | |||
| 3c89bb6e4a62 | Tibor Simko | WebStyle: new /ping handler | Dec 13 2012 |