Marc Alexander 87ca5ef7e5 Merge branch '3.1.x' ... Conflicts: phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html phpBB/styles/subsilver2/theme/stylesheet.css		2015-03-05 14:23:50 +01:00
..
template	Merge branch '3.1.x'	2015-03-05 14:23:50 +01:00
theme	[ticket/13590] Headers of remember me login keys are not centered	2015-03-04 06:00:27 -05:00
style.cfg	[prep-release-3.1.3] Update version to 3.1.2-RC1	2015-01-26 19:42:06 +01:00