Merge branch 'maint-1.1'
- maint-1.1: WebSearch: get_fieldvalues_alephseq_like() utils git: addition of compile to gitignore
Conflicts:
modules/websearch/lib/websearch_webinterface.py
Signed-off-by: Tibor Simko <tibor.simko@cern.ch>
Tibor Simko <tibor.simko@cern.ch> | Sep 17 2013, 13:34 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
cc810c75b5dd | Tibor Simko | WebSearch: get_fieldvalues_alephseq_like() utils | Sep 17 2013 | |||
1bd0fa90b824 | Tibor Simko | Merge branch 'maint-1.0' into maint-1.1 | Sep 17 2013 | |||
1a3dc9cc0a5f | Tibor Simko | git: addition of compile to gitignore | Sep 17 2013 |