Marcia Ramos b8485707f2 Fix conflict ... Merge branch 'master' into 'docs-article-undo-things-in-git' # Conflicts: # doc/articles/index.md		2017-08-17 19:03:27 +00:00
..
artifactory_and_gitlab	fix relative link	2017-08-15 14:16:53 -03:00
how_to_configure_ldap_gitlab_ce	fix date format	2017-08-15 14:16:35 -03:00
how_to_install_git	fix date format	2017-08-15 14:16:35 -03:00
numerous_undo_possibilities_in_git	general review	2017-08-11 17:05:09 -03:00
openshift_and_gitlab	fix date format	2017-08-15 14:16:35 -03:00
index.md	Fix conflict	2017-08-17 19:03:27 +00:00