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