Homec4science

Merge branch 'master' into next

Authored by Tibor Simko <tibor.simko@cern.ch> on Dec 13 2012, 18:19.

Description

Merge branch 'master' into next

  • master: WebStyle: dumb page loading fix WebStyle: new /ping handler

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:6646370f5a12: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Dec 13 2012, 18:19

Merged Changes

CommitAuthorDetailsCommitted
35382f8c5111Tibor Simko
Merge branch 'maint-1.1' 
Dec 13 2012
b3208860a44cTibor Simko
Merge branch 'maint-1.0' into maint-1.1 
Dec 13 2012
7b75a97bdd71Tibor Simko
WebStyle: dumb page loading fix 
Dec 13 2012
3c89bb6e4a62Tibor Simko
WebStyle: new /ping handler 
Dec 13 2012