gitlabhq/app/assets/images/merge.png at 0c599047153e1e556e4185703156c4e02e0933be

Sytse Sijbrandij b80dd3d242 Non-interactive AWS install by running a single script.

Merge branch 'master' into non-interactive-aws-install

Conflicts:
	doc/installation.md

Fix merge mess in installation.md

2012-09-02 18:39:50 +02:00