Homec4science

Merge branch 'master' into next

Authored by kuncar on Jan 21 2015, 13:56.

Description

Merge branch 'master' into next

  • master: installation: disable SSLv2/SSLv3 in Apache config

Conflicts:
invenio/legacy/inveniocfg.py

Details

Committed
kuncarJan 21 2015, 13:56
Parents
R3600:4b41796db444: Merge branch 'maint-1.1'
R3600:313524695a89: deposit: workflow delete fix
Branches
Unknown
Tags
Unknown

Event Timeline

Jiri Kuncar <jiri.kuncar@cern.ch> committed R3600:db876b8d233c: Merge branch 'master' into next (authored by Jiri Kuncar <jiri.kuncar@cern.ch>).Jan 21 2015, 13:56

Merged Changes

CommitAuthorDetailsCommitted
4b41796db444Tibor Simko
Merge branch 'maint-1.1' 
Jan 15 2015
521a0ee4535aTibor Simko
Merge branch 'maint-1.0' into maint-1.1 
Jan 15 2015
577632fca777Tibor Simko
installation: disable SSLv2/SSLv3 in Apache config 
Jan 15 2015