Nils Adermann 837ed8b6e1 Merge branch 'develop-ascraeus' into develop ...

* develop-ascraeus:
  [ticket/12822] Fix test runs of avatar manager_test
  [ticket/12822] Add method for deleting avatars and use confirm_box
  [ticket/12822] Remove "None" option from avatar select boxes

Conflicts:
	phpBB/styles/subsilver2/template/ucp_groups_manage.html
	phpBB/styles/subsilver2/template/ucp_profile_avatar.html

2014-08-11 17:38:29 +02:00

..

prosilver

Merge remote-tracking branch 'github-marc1706/ticket/12822' into develop-ascraeus

2014-08-11 17:37:56 +02:00