Homec4science

Merge branch 'maint-1.1'

Authored by Tibor Simko <tibor.simko@cern.ch> on Nov 15 2012, 15:31.

Description

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

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:2b78381d385f: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).Nov 15 2012, 15:32

Merged Changes

CommitAuthorDetailsCommitted
940fc8a411b5Samuele Kaplun/Tibor Simko
WebSearch: get_all_field_values() typo 
Nov 15 2012
b1db733c8580Tibor Simko
Merge branch 'maint-1.0' into maint-1.1 
Nov 15 2012
ce280f87aba0Samuele Kaplun/Tibor Simko
WebStyle: req.is_https() fix 
Nov 15 2012