Merge branch 'maint-2.0' into maint-2.1
- maint-2.0: docs: warning about PYC-files and docker dev setup docker: tests passing in compose dev config global: conf variable from ENV, parsing fix
Description
Description
Details
Details
- Committed
kuncar Jun 19 2015, 15:34 - Parents
- R3600:960b3bd8dd92: docs: warning about PYC-files and docker dev setup
R3600:f4bf802ef8e1: accounts: localized site name for user email - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 960b3bd8dd92 | Marco Neumann | docs: warning about PYC-files and docker dev setup | Jun 19 2015 | |||
| 079c39365742 | Marco Neumann | docker: tests passing in compose dev config | Jun 19 2015 | |||
| fee3f46cbc33 | Marco Neumann | global: conf variable from ENV, parsing fix | Jun 19 2015 |