Tristan Darricau df723c388a Merge branch '3.1.x' ... * 3.1.x: [ticket/10343] Add a distinction for inactive users on memberlist [ticket/10343] Allows a_user to show inactive accounts in memberlist		2015-10-14 16:32:37 +02:00
..
all/template	[ticket/13645] Move the feeds to controllers	2015-08-23 22:36:10 +02:00
prosilver	Merge branch '3.1.x'	2015-10-14 16:32:37 +02:00