git.cweiske.de / phorkie.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 63575a0 149e039)
Merge branch 'master' into remotefork
authorChristian Weiske <cweiske@cweiske.de>
Wed, 19 Sep 2012 17:00:35 +0000 (19:00 +0200)
committerChristian Weiske <cweiske@cweiske.de>
Wed, 19 Sep 2012 17:00:35 +0000 (19:00 +0200)
1  2 
www/.htaccess patch | diff1 | diff2 | blob | history

diff --cc www/.htaccess
Simple merge
Self-hosted pastebin software written in PHP. Pastes are editable, may have multiple files and are stored in git repositories.