phpbb/phpBB
Igor Wiedler d4e00b6c0d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10616] Add template inheritance to exported template
  [ticket/10616] Ignore template inheritance that points to self
  [ticket/10616] Add template inheritance to default styles
2012-02-07 16:57:09 +01:00
..
adm Merge branch 'develop-olympus' into develop 2012-02-03 17:00:09 -05:00
assets/javascript [ticket/10155] Update to jQuery 1.6.2 2011-07-12 10:24:20 +02:00
cache [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
develop [ticket/9916] Updating header license and removing Version $Id$ 2012-01-02 19:10:27 +01:00
docs Merge branch 'develop-olympus' into develop 2012-01-02 17:36:21 +01:00
download [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
files [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
images [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
includes Merge branch 'develop-olympus' into develop 2012-02-07 16:57:09 +01:00
install Merge remote-tracking branch 'imkingdavid/ticket/10535' into develop 2012-02-03 16:21:51 -05:00
language Merge branch 'develop-olympus' into develop 2012-02-03 17:00:09 -05:00
store [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
styles Merge branch 'develop-olympus' into develop 2012-02-07 16:57:09 +01:00
.htaccess [Feature] Ability to use HTTP authentication in ATOM feeds by passing the GET parameter auth=http 2010-01-19 19:08:51 +00:00
common.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
cron.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
faq.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
feed.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
index.php Merge branch 'develop-olympus' into develop 2012-01-15 21:43:29 +01:00
mcp.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
memberlist.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
posting.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
report.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
search.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
ucp.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
viewforum.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
viewonline.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
viewtopic.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
web.config [ticket/10219] Remove invalid and invisible character from web.config. 2011-06-14 23:18:33 +02:00