diff options
| author | Jonne Haß <me@jhass.eu> | 2020-09-04 22:57:52 +0300 |
|---|---|---|
| committer | Jonne Haß <me@jhass.eu> | 2020-09-04 22:58:57 +0300 |
| commit | 15c11b87caf4bc6a3a5d6c627732a0d88eb3e527 (patch) | |
| tree | b30d606e93efcaa56ca7507f1505bfefed21ee58 /.gitignore | |
| parent | 9df2e957244e81151c6b5ae9dbc2f7420308ced3 (diff) | |
| parent | ce82ba3dde7178b6e707d83bc6246fe033a328c9 (diff) | |
Merge branch 'next-minor' into develop
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index c18b96c64..a91f73413 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ app/views/terms/terms.* app/assets/images/custom/ # Configuration files +config/diaspora.toml config/diaspora.yml config/initializers/secret_token.rb .bundle |