Merge branch 'maint-1.1'
- maint-1.1: WebComment: attachments in multi-node setup WebSearch: disable meta tags for deleted records
Conflicts:
modules/websearch/lib/search_engine.py
Signed-off-by: Tibor Simko <tibor.simko@cern.ch>
Tibor Simko <tibor.simko@cern.ch> | Mar 5 2014, 10:09 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
fd1e8dca60c2 | Jerome Caffaro/Tibor Simko | WebComment: attachments in multi-node setup | Mar 5 2014 | |||
a8a63febc324 | Jerome Caffaro/Tibor Simko | WebSearch: disable meta tags for deleted records | Mar 5 2014 |