Homec4science

Merge branch 'master' into next

Authored by kuncar on Feb 25 2015, 00:56.

Description

Merge branch 'master' into next

  • master: docker: more complete configuration docker: initial release

Conflicts:
.gitignore
invenio/legacy/inveniocfg.py

Details

Event Timeline

Jiri Kuncar <jiri.kuncar@cern.ch> committed R3600:4e7f7c406026: Merge branch 'master' into next (authored by Jiri Kuncar <jiri.kuncar@cern.ch>).Feb 25 2015, 00:56

Merged Changes

CommitAuthorDetailsCommitted
4dbe1df7e32dTibor Simko
docker: more complete configuration 
Feb 22 2015
eb2646df8cd8Tibor Simko
Merge branch 'maint-1.1' 
Feb 18 2015
3afe50866b50Tibor Simko
Merge branch 'maint-1.0' into maint-1.1 
Feb 18 2015
9186606cf59eTibor Simko
docker: initial release 
Feb 18 2015