NorbiPeti ce29422177 Merge master to dev		2019-04-25 15:16:14 +02:00
..
java/buttondevteam	Merge master to dev	2019-04-25 15:16:14 +02:00
resources	Moved Votifier reward here, fixes	2019-03-01 17:52:45 +01:00