Cesar G 49c875413c Merge remote-tracking branch 'PayBas/ticket/12541' into develop-ascraeus ...

* PayBas/ticket/12541:
  [ticket/12541] Activate attachments tab when files are dropped into textarea

Conflicts:
	phpBB/styles/prosilver/template/forum_fn.js

2014-06-04 23:07:02 -07:00

..

template

Merge remote-tracking branch 'PayBas/ticket/12541' into develop-ascraeus

2014-06-04 23:07:02 -07:00

theme

Merge remote-tracking branch 'PayBas/ticket/12615' into develop-ascraeus

2014-06-04 22:59:37 -07:00

style.cfg

[prep-release-3.1.0-b4] Update version to 3.1.0-b4

2014-05-30 16:23:44 +02:00