projects / platal.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b66dc2b) | patch
Fixes merge conflict pages.
authorStéphane Jacob <sj@m4x.org>
Mon, 25 Oct 2010 22:39:38 +0000 (00:39 +0200)
committerStéphane Jacob <sj@m4x.org>
Mon, 25 Oct 2010 22:40:15 +0000 (00:40 +0200)
commitd20f50cff9bbbaf171800cfa3e8de6621fb549d5
treee03bdd18fd4fe89ca5f6df8fdab6e6d5934b79c7tree | snapshot
parentb66dc2be115ea07ed7ee09d0fb1280236483702acommit | diff
Fixes merge conflict pages.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
modules/fusionax.php diff | blob | blame | history
templates/fusionax/deathdate_issues.tpl diff | blob | blame | history
templates/fusionax/other_issues.tpl diff | blob | blame | history
templates/fusionax/promo_issues.tpl diff | blob | blame | history
plat/al