Merge branch 'maint-2.0'
e9ff05f713c2
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Jun 1 2015, 22:45.

Description

Merge branch 'maint-2.0'

maint-2.0: installation: post-release version bump Invenio v2.0.4 knowledge: fix HTML character encoding installation: Apache 2.4 configuration syntax fix

Conflicts:
invenio/version.py

Signed-off-by: Tibor Simko <tibor.simko@cern.ch>

Committed

Tibor Simko <tibor.simko@cern.ch>

Jun 1 2015, 22:45

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:e9ff05f713c2: Merge branch 'maint-2.0' (authored by Tibor Simko <tibor.simko@cern.ch>).Jun 1 2015, 22:45

Commit	Author	Details	Committed
322dd051a43d	Tibor Simko	installation: post-release version bump	Jun 1 2015
6f6b0d01b734	Tibor Simko	Invenio v2.0.4	Jun 1 2015
c9dbe0613e31	Tibor Simko	knowledge: fix HTML character encoding	Jun 1 2015
e09e314123d6	Tibor Simko	installation: Apache 2.4 configuration syntax fix	Jun 1 2015