Merge branch 'master' into next
- master: global: /record configurable via CFG_SITE_RECORD I18N: adds missing new files to POTFILES.in
Conflicts:
modules/bibedit/lib/bibedit_engine.js
Merge branch 'master' into next
Conflicts:
modules/bibedit/lib/bibedit_engine.js
Tibor Simko <tibor.simko@cern.ch> | May 18 2011, 17:07 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
f13d432c658f | Peter Halliday/Tibor Simko | global: /record configurable via CFG_SITE_RECORD | May 18 2011 | |||
6b203be8fd5d | Tibor Simko | I18N: adds missing new files to POTFILES.in | May 17 2011 |