Merge branch 'master' into next
- master: docker: more complete configuration docker: initial release
Conflicts:
.gitignore
invenio/legacy/inveniocfg.py
kuncar | Feb 25 2015, 00:56 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
4dbe1df7e32d | Tibor Simko | docker: more complete configuration | Feb 22 2015 | |||
eb2646df8cd8 | Tibor Simko | Merge branch 'maint-1.1' | Feb 18 2015 | |||
3afe50866b50 | Tibor Simko | Merge branch 'maint-1.0' into maint-1.1 | Feb 18 2015 | |||
9186606cf59e | Tibor Simko | docker: initial release | Feb 18 2015 |