Merge branch 'maint-1.1'
- maint-1.1: WebSearch: get_all_field_values() typo WebStyle: req.is_https() fix
Conflicts:
modules/websearch/lib/search_engine.py
Tibor Simko <tibor.simko@cern.ch> | Nov 15 2012, 15:32 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
940fc8a411b5 | Samuele Kaplun/Tibor Simko | WebSearch: get_all_field_values() typo | Nov 15 2012 | |||
b1db733c8580 | Tibor Simko | Merge branch 'maint-1.0' into maint-1.1 | Nov 15 2012 | |||
ce280f87aba0 | Samuele Kaplun/Tibor Simko | WebStyle: req.is_https() fix | Nov 15 2012 |