Merge branch 'develop-ascraeus' into develop

Browse source

* develop-ascraeus:
  [ticket/13391] subsilver2 poll options must have a setting of 1 when editing a post

Conflicts:
	phpBB/styles/subsilver2/template/posting_poll_body.html

...

This commit is contained in:

Cesar G 2014-11-26 18:44:56 -08:00

parent 36a337ffab 79a1495f66

commit 388fdae49f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available