git.cweiske.de / phorkie.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dca6d8d 29035e2)
Merge branch 'auth-openid'
authorChristian Weiske <cweiske@cweiske.de>
Tue, 18 Sep 2012 22:08:43 +0000 (00:08 +0200)
committerChristian Weiske <cweiske@cweiske.de>
Tue, 18 Sep 2012 22:08:43 +0000 (00:08 +0200)
1  2 
README.rst patch | diff1 | diff2 | blob | history

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