Douwe Maan d29598e691 Merge remote-tracking branch 'dev/master' ... # Conflicts: # Gemfile # Gemfile.lock		2017-07-26 14:47:50 +02:00
..
how_to_configure_ldap_gitlab_ce	…
how_to_install_git	…
index.md	…