Phil Hughes 639bca4362 Merge branch 'master' into go-go-gadget-webpack		2017-01-13 10:30:40 -05:00
..
assets	Merge branch 'patch-turbolinks' into 'security'	2017-01-10 19:41:52 -05:00
dockerfile	Allow to use Dockerfile templates	2016-11-08 13:54:58 +00:00
gitignore	update templates	2017-01-09 15:24:25 +01:00
gitlab-ci-yml	add missing openshift template	2017-01-10 17:53:09 +01:00