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
..
2014-07-03 14:24:47 +02:00
2014-05-27 20:51:13 +02:00
2014-05-27 20:51:13 +02:00
2014-05-27 20:51:13 +02:00
2014-05-27 20:51:13 +02:00
2014-05-27 20:51:13 +02:00
2014-08-07 17:29:33 +02:00
2014-08-07 17:29:33 +02:00
2014-08-07 17:29:33 +02:00
2014-08-07 17:29:33 +02:00
2014-05-27 20:51:13 +02:00
2014-08-07 17:29:33 +02:00
2014-05-27 20:51:13 +02:00
2014-08-10 01:27:28 +02:00
2014-07-13 18:09:34 +02:00
2014-05-27 20:51:13 +02:00
2014-05-27 20:51:13 +02:00
2014-05-27 20:51:13 +02:00
2014-05-27 20:51:13 +02:00
2014-07-04 01:22:32 -07:00
2014-08-09 17:18:33 +02:00
2014-08-09 17:18:33 +02:00
2014-08-09 17:18:33 +02:00
2014-05-27 20:51:13 +02:00
2014-05-27 20:51:13 +02:00
2014-05-27 20:51:13 +02:00
2014-07-04 01:22:32 -07:00
2014-05-27 20:51:13 +02:00
2014-07-09 00:12:57 +02:00
2014-05-27 20:51:13 +02:00
2014-05-29 01:07:44 +03:00
2014-05-27 20:51:13 +02:00
2014-06-05 09:59:34 +02:00
2014-08-09 17:18:33 +02:00
2014-06-10 15:51:25 +02:00
2014-07-31 15:36:58 +02:00
2014-05-27 20:51:13 +02:00
2014-05-27 20:51:13 +02:00
2014-05-27 20:51:13 +02:00
2014-05-27 20:51:13 +02:00
2014-05-27 20:51:13 +02:00
2014-05-27 20:51:13 +02:00
2014-06-21 03:35:19 +05:30
2014-05-27 20:51:13 +02:00
2014-05-27 20:51:13 +02:00
2014-05-27 20:51:13 +02:00
2014-07-04 01:22:32 -07:00