Merge branch 'maint-2.1'
- maint-2.1: 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:fc8fcc413677: Merge branch 'maint-2.0' into maint-2.1
R3600:7491eccee4a7: accounts: panel_start macro extra class parameter - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| fc8fcc413677 | Jiri Kuncar | Merge branch 'maint-2.0' into maint-2.1 | Jun 19 2015 | |||
| 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 |