Merge branch 'maint-1.1' into maint-1.2
- maint-1.1: WebStyle: HttpOnly cookie attribute
Conflicts:
modules/websession/lib/session.py
modules/webstyle/lib/webinterface_handler_wsgi_utils.py
Signed-off-by: Tibor Simko <tibor.simko@cern.ch>
Description
Description
Details
Details
- Committed
Tibor Simko <tibor.simko@cern.ch> Apr 28 2015, 15:49 - Parents
- R3600:c3b3e1a28cce: Merge branch 'maint-1.0' into maint-1.1
R3600:6be96d4a8c18: WebSearch: fix for collection names with slashes - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| c3b3e1a28cce | Tibor Simko | Merge branch 'maint-1.0' into maint-1.1 | Apr 28 2015 | |||
| e83f600fea90 | Tibor Simko | WebStyle: HttpOnly cookie attribute | Apr 28 2015 |