mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
I simply used the develop-olympus version of all files that conflicted.
Afterall there should not have been anything new in develop yet.
This commit is contained in:
Nils Adermann
2010-03-03 23:32:09 +01:00
parent b68de2323d ac32927566
commit 693a2dc99b
127 changed files with 6192 additions and 962 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/install/schemas/postgres_schema.sql
View File

@@ -1117,6 +1117,7 @@ CREATE TABLE phpbb_topics_track (
PRIMARY KEY (user_id, topic_id)
);
CREATE INDEX phpbb_topics_track_topic_id ON phpbb_topics_track (topic_id);
CREATE INDEX phpbb_topics_track_forum_id ON phpbb_topics_track (forum_id);
/*