app/controllers · b80dd3d2422b59a1b241ccdae32140ca19f33dc3 · Forest Godfrey / gitlab-ce

authored Sep 02, 2012

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

Conflicts:
	doc/installation.md

Fix merge mess in installation.md

b80dd3d2

Name	Last commit	Last update
..
admin		Loading commit data...
application_controller.rb		Loading commit data...
commits_controller.rb		Loading commit data...
dashboard_controller.rb		Loading commit data...
deploy_keys_controller.rb		Loading commit data...
errors_controller.rb		Loading commit data...
help_controller.rb		Loading commit data...
hooks_controller.rb		Loading commit data...
issues_controller.rb		Loading commit data...
keys_controller.rb		Loading commit data...
labels_controller.rb		Loading commit data...
merge_requests_controller.rb		Loading commit data...
milestones_controller.rb		Loading commit data...
notes_controller.rb		Loading commit data...
omniauth_callbacks_controller.rb		Loading commit data...
profile_controller.rb		Loading commit data...
projects_controller.rb		Loading commit data...
protected_branches_controller.rb		Loading commit data...
refs_controller.rb		Loading commit data...
repositories_controller.rb		Loading commit data...
search_controller.rb		Loading commit data...
snippets_controller.rb		Loading commit data...
team_members_controller.rb		Loading commit data...
wikis_controller.rb		Loading commit data...