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-05-27 20:51:13 +02:00
2014-08-11 01:17:01 +02:00
2014-08-11 17:37:56 +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 21:55:40 +02:00
2014-08-10 13:43:04 +02:00
2014-08-10 13:43:04 +02:00
2014-08-10 15:24:43 +02:00
2014-05-27 20:51:13 +02:00
2014-08-10 13:43:04 +02:00
2014-08-10 13:43:04 +02:00
2014-08-08 16:40:33 +02:00
2014-05-27 20:51:13 +02:00
2014-08-10 12:17:03 +02:00
2014-08-10 15:24:43 +02:00
2014-05-29 23:44:10 +02:00
2014-07-07 01:02:29 +02:00
2014-08-11 17:38:29 +02:00
2014-08-10 13:43:04 +02:00
2014-05-27 20:51:13 +02:00
2014-06-25 14:19:09 +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-10 13:43:04 +02:00
2014-05-27 20:51:13 +02:00
2014-08-10 13:43:04 +02:00
2014-05-28 23:33:25 +02:00
2014-05-27 20:51:13 +02:00
2014-07-11 11:49:51 +02:00
2014-05-27 20:51:13 +02:00
2014-08-10 13:43:04 +02:00
2014-08-10 13:43:04 +02:00
2014-06-01 21:31:05 +02:00
2014-06-29 20:54:43 +02:00
2014-05-27 20:51:13 +02:00
2014-08-10 13:43:04 +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-10 13:43:04 +02:00
2014-08-11 01:16:22 +02:00
2014-08-10 15:24:43 +02:00
2014-08-10 15:24:43 +02:00
2014-06-14 11:34:32 +02:00
2014-05-27 20:51:13 +02:00
2014-06-23 21:37:47 +02:00
2014-08-10 13:43:04 +02:00
2014-05-27 20:51:13 +02:00
2014-08-10 13:43:04 +02:00
2014-07-08 17:53:32 +02:00
2014-05-27 20:51:13 +02:00
2014-08-09 17:18:33 +02:00
2014-08-08 15:29:34 +02:00
2014-05-27 20:51:13 +02:00
2014-05-27 20:51:13 +02:00
2014-06-20 12:35:42 +02:00