Antonin Delpeuch a4117b470c Remove leftover merge conflicts		2018-11-30 19:39:42 +09:00
..
modules/core	Remove leftover merge conflicts	2018-11-30 19:39:42 +09:00
WEB-INF	Revert "Revert "Migrate to Maven""	2018-09-16 15:34:47 +01:00