Commit Graph

2 Commits

Author SHA1 Message Date
Ingo Schommer
91f6039eed Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	control/Director.php
2013-11-05 10:15:40 +01:00
Ingo Schommer
11fd15c87d Added 3.1.2 changelog 2013-10-07 15:21:56 +02:00