diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-08-11 17:37:56 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-08-11 17:37:56 +0200 |
| commit | bad90dafbfe8a093a518b90b82a01d4e63e757f2 (patch) | |
| tree | e97a0d694ba8926910f8afb512302907fb1d6e32 /phpBB/phpbb/template/twig/lexer.php | |
| parent | 91df95a90dd3266f4beeb7df7534f75882909581 (diff) | |
| parent | 70978e96d34ddf3bea24c363800e9fc920c3120b (diff) | |
| download | forums-bad90dafbfe8a093a518b90b82a01d4e63e757f2.tar forums-bad90dafbfe8a093a518b90b82a01d4e63e757f2.tar.gz forums-bad90dafbfe8a093a518b90b82a01d4e63e757f2.tar.bz2 forums-bad90dafbfe8a093a518b90b82a01d4e63e757f2.tar.xz forums-bad90dafbfe8a093a518b90b82a01d4e63e757f2.zip | |
Merge remote-tracking branch 'github-marc1706/ticket/12822' into develop-ascraeus
* github-marc1706/ticket/12822:
[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
Diffstat (limited to 'phpBB/phpbb/template/twig/lexer.php')
0 files changed, 0 insertions, 0 deletions