conflict file names fix
author Jimako
()
committer Jimako
()
commit c61a7bddf9b7a974ad9702a97be6aba01f46ed26
tree ab6d59f62097b5466c5b6d22ba5b0ce556674326
parent b20feeb1a6ed9ffdbe555ebcc306dd2dfaa8118a
conflict file names fix
17 files changed:
admin/news.php
blocks/search/search.php
docs/messages.sql
docs/pagelinks.sql
includes/corefunctions.php
includes/seriesblock.php
includes/storyblock.php
install/install.php
languages/en.php
modules/challenges/browse.php
modules/challenges/challenges.php
modules/challenges/challengesby.php
report.php
reviews.php
searching.php
user/profile.php
viewstory.php