]> git.parisson.com Git - timeside.git/commit
Merge branch 'feature/docker-compose' into feature/wave
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 4 Mar 2015 10:35:21 +0000 (11:35 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 4 Mar 2015 10:35:21 +0000 (11:35 +0100)
commitea83917a02e7142459da8b0f4342ba251a8bf38c
tree1c4db82770bffa7d9324ee2523474c3a0fa2f287
parent5b659ba4f4db22ca2bb099dcb2ec4e73d34c23a4
parent54f8dac1ec1c379ecfd5adf9eddcee4cbbed0c22
Merge branch 'feature/docker-compose' into feature/wave

Conflicts:
timeside/server/templates/timeside/index.html
timeside/server/templates/timeside/item_detail.html