snipe dc3af7cc74 Resolved conflicts ... Signed-off-by: snipe <snipe@snipe.net>		2021-10-04 20:39:24 -07:00
..
general.php	Revert "Updated translations"	2020-10-08 18:43:06 -07:00
message.php	Resolved conflicts	2021-10-04 20:39:24 -07:00
table.php	Add a manager field to locations.	2017-06-12 18:23:50 -05:00