Searched hist:"14739 a206f851219daa577abdfd7489d86b0072b" (Results 1 – 2 of 2) sorted by relevance
| /dokuwiki/inc/parser/ |
| H A D | metadata.php | 14739a206f851219daa577abdfd7489d86b0072b Sun Feb 06 19:28:39 UTC 2011 Andreas Gohr <andi@splitbrain.org> Revert "merged branch 'danny0838:rewrite_block' and resolved conflict"
Anika's merge did not pul in the individual patches as one would expect.
Then I messed up when trying to fix this by merging with danny's repo
again but used the wrong branch. So we're still missing two patches. To
have them apply cleanly I have to revert Anika's merge here. Another
merge for the missing two patches will follow.
This reverts commit b17e20ac9cca30b612968d02f06fa9c5df5c01f0.
|
| H A D | xhtml.php | 14739a206f851219daa577abdfd7489d86b0072b Sun Feb 06 19:28:39 UTC 2011 Andreas Gohr <andi@splitbrain.org> Revert "merged branch 'danny0838:rewrite_block' and resolved conflict"
Anika's merge did not pul in the individual patches as one would expect.
Then I messed up when trying to fix this by merging with danny's repo
again but used the wrong branch. So we're still missing two patches. To
have them apply cleanly I have to revert Anika's merge here. Another
merge for the missing two patches will follow.
This reverts commit b17e20ac9cca30b612968d02f06fa9c5df5c01f0.
|