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