Merge branch 'maint-0.99' into maint-1.0
- maint-0.99: WebAccess: IP-based rules and offline user fix
Conflicts:
modules/webaccess/lib/access_control_firerole.py
modules/webaccess/lib/access_control_firerole_tests.py
Description
Description
Details
Details
- Committed
Tibor Simko <tibor.simko@cern.ch> Jan 7 2013, 14:11 - Parents
- R3600:c671331829b8: WebAccess: IP-based rules and offline user fix
R3600:b6b0e392d252: Invenio v1.0.4 - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| c671331829b8 | Samuele Kaplun/Tibor Simko | WebAccess: IP-based rules and offline user fix | Jan 7 2013 |