diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2018-07-16 18:03:31 +0300 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2018-07-16 18:03:31 +0300 |
commit | 5c4934ee9486fb5ce7f14581680369010009835b (patch) | |
tree | fd92eca70eedfe220e42e38744a0605a49a680e9 /doc/development/architecture.md | |
parent | 433189c85edac278ac6952a04745db2a02d50a14 (diff) |
CONFLICT! [ci skip]
Diffstat (limited to 'doc/development/architecture.md')
-rw-r--r-- | doc/development/architecture.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/development/architecture.md b/doc/development/architecture.md index 6ca3e9e5a0a..e6cf5e01f46 100644 --- a/doc/development/architecture.md +++ b/doc/development/architecture.md @@ -197,4 +197,4 @@ Note: It is recommended to log into the `git` user using `sudo -i -u git` or `su ## GitLab.com -We've also detailed [our architecture of GitLab.com](https://about.gitlab.com/handbook/infrastructure/production-architecture/) but this is probably over the top unless you have millions of users. +CONFLICT! |