Merge branch 'master' of github.com:SamSaffron/discourse_docker
authorSam Saffron <sam.saffron@gmail.com>
Thu, 28 Nov 2013 03:22:16 +0000 (19:22 -0800)
committerSam Saffron <sam.saffron@gmail.com>
Thu, 28 Nov 2013 03:22:16 +0000 (19:22 -0800)
commit03f50dca16c357467e473ffc5f1b3b06dd1853e9
treea0bf9c7afb07d0c823b41b4f8ae8ba4871db7ab1
parent67a25ebf2a0730cbc1439fbfab9421983289502a
parent68a035e1abc78f505fc92e32e4c3fd65be2ca433
Merge branch 'master' of github.com:SamSaffron/discourse_docker

Conflicts:
standalone.template.yml