git.cweiske.de / phorkie.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 227289a 239fca4)
Merge remote-tracking branch 'origin/master'
authorChristian Weiske <cweiske@cweiske.de>
Fri, 4 Jul 2014 05:37:06 +0000 (07:37 +0200)
committerChristian Weiske <cweiske@cweiske.de>
Fri, 4 Jul 2014 05:37:06 +0000 (07:37 +0200)
commit43ef6e8dfd4345262f7b974506261e0827bfecae
tree8caa1bbb422c4aef711d02d2dfc0d5a14d187d64tree | snapshot
parent227289a8fa6093f468290d4b3b68f6948f1a2b14commit | diff
parent239fca45d3685c2f3290015b49470f945648a8e5commit | diff
Merge remote-tracking branch 'origin/master'

Conflicts:
src/phorkie/Renderer/Geshi.php
src/phorkie/SetupCheck.php
data/config.default.php diff1 | diff2 | blob | history
src/phorkie/Renderer/Geshi.php diff1 | diff2 | blob | history
www/www-header.php diff1 | diff2 | blob | history
Self-hosted pastebin software written in PHP. Pastes are editable, may have multiple files and are stored in git repositories.