git.cweiske.de / phorkie.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 69224ff 36e2a88)
Merge remote-tracking branch 'skl85/hotfix-extautodetect'
authorChristian Weiske <cweiske@cweiske.de>
Wed, 22 Aug 2012 19:45:01 +0000 (21:45 +0200)
committerChristian Weiske <cweiske@cweiske.de>
Wed, 22 Aug 2012 19:45:01 +0000 (21:45 +0200)

Trivial merge
Self-hosted pastebin software written in PHP. Pastes are editable, may have multiple files and are stored in git repositories.