diff options
| author | mjfriaza <mjfriaza@disroot.org> | 2022-05-17 13:44:06 +0200 |
|---|---|---|
| committer | mjfriaza <mjfriaza@disroot.org> | 2022-05-17 13:44:06 +0200 |
| commit | a75c61d71efebf43713026200aa0f513bd7eef09 (patch) | |
| tree | 909048adeaa329813e2530d43626ed3bd711bc25 /.gitignore | |
| parent | 481ecee9e87342ca7a1217395085e95d1a3b61ea (diff) | |
| parent | 0d0f73fb67bbfcc53058cefded85ac36f951c7a7 (diff) | |
| download | volse-hubzilla-a75c61d71efebf43713026200aa0f513bd7eef09.tar.gz volse-hubzilla-a75c61d71efebf43713026200aa0f513bd7eef09.tar.bz2 volse-hubzilla-a75c61d71efebf43713026200aa0f513bd7eef09.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index fa09c4ee6..c77ee0466 100644 --- a/.gitignore +++ b/.gitignore @@ -33,8 +33,10 @@ apps/ home.html # page header plugin pageheader.html -# Ignore site TOS +# Ignore site TOS & gddpr doc/SiteTOS.md +doc/*/SiteTOS.md +doc/*/gdpr.md # themes except for redbasic view/theme/* !view/theme/redbasic @@ -55,6 +57,7 @@ tests/results/ .buildpath .externalToolBuilders .settings/ +.pydevproject # NetBeans project folder nbproject/ # Kdevelop project files @@ -75,3 +78,5 @@ composer.phar vendor/**/tests/ vendor/**/Test/ vendor/sabre/*/examples/ +# /info is a directory containing site-specific HTML documents +/info/ |