James Edwards-Jones b988faaf85 Merge branch 'master' into 'jej-pages-to-ce' ... # Conflicts: # db/schema.rb		2017-02-06 15:12:27 +00:00
..
builds	…
img	…
integrations	Move project services to new location under Integrations	2017-02-03 20:28:47 +01:00
issues	…
merge_requests	…
pages	Fix documentation link in doc/user/project/pages/index.md	2017-02-03 18:25:29 +00:00
pipelines	…
repository	…
settings	…
container_registry.md	…
cycle_analytics.md	…
description_templates.md	…
git_attributes.md	…
highlighting.md	…
issue_board.md	…
koding.md	…
labels.md	…
merge_requests.md	…
new_ci_build_permissions_model.md	…
protected_branches.md	…
slash_commands.md	Fixed typo	2017-02-04 10:33:53 -05:00