diff options
author | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 23:15:48 (JST) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 23:15:48 (JST) |
commit | 37a24e4e39737edaa5cdde501346a65eeb280e63 (patch) | |
tree | ff23eb0d57edf108edd1aa3e64a8d6cf70062954 /cgitrc.5.txt | |
parent | 47187b33be1c3de43fbed6f350ab05bc978aacd0 (diff) | |
parent | a2cbd3c30b64a26b52b2003ba6569f3c083f4092 (diff) | |
download | cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.zip cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.tar.gz |
Merge branch 'jh/path-limit'
Conflicts:
cgit.h
ui-commit.c
Diffstat (limited to 'cgitrc.5.txt')
-rw-r--r-- | cgitrc.5.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 5c24381..a853522 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -444,7 +444,7 @@ snapshots=tar.gz tar.bz2 zip | |||
444 | ## List of common mimetypes | 444 | ## List of common mimetypes |
445 | ## | 445 | ## |
446 | 446 | ||
447 | mimetype.git=image/git | 447 | mimetype.gif=image/gif |
448 | mimetype.html=text/html | 448 | mimetype.html=text/html |
449 | mimetype.jpg=image/jpeg | 449 | mimetype.jpg=image/jpeg |
450 | mimetype.jpeg=image/jpeg | 450 | mimetype.jpeg=image/jpeg |