Oleg Pudeyev 248559d7d1 Merge PR #734 branch 'shibulijack/ticket/10688' into develop ...

* shibulijack/ticket/10688:
  [ticket/10688] Update install.html for 3.1 and current practices.
  [ticket/10688] Update readme for 3.1 and current practices.
  [ticket/10688] Changed version 3.0 to 3.1
  [ticket/10688] Updated version to 3.1
  [ticket/10688] Changed 3.0 to 3.1 in docs

Conflicts:
	phpBB/docs/INSTALL.html
	phpBB/docs/README.html

2012-04-19 21:43:23 -04:00

..

prosilver

Merge PR #734 branch 'shibulijack/ticket/10688' into develop

2012-04-19 21:43:23 -04:00

subsilver2

Merge PR #592 branch 'develop-olympus' into develop

2012-04-19 21:03:15 -04:00