git.cweiske.de / phorkie.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1797cbc 4316861)
Merge branch 'master' into remotefork
authorChristian Weiske <cweiske@cweiske.de>
Wed, 19 Sep 2012 17:09:10 +0000 (19:09 +0200)
committerChristian Weiske <cweiske@cweiske.de>
Wed, 19 Sep 2012 17:09:10 +0000 (19:09 +0200)

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