5 Commits

Author	SHA1	Message	Date
Xavier	4d7a3b8a33	Merge branch 'v2.0'	2019-04-09 22:30:05 +02:00
Xavier	804a996810	Update versions	2019-04-09 22:04:19 +02:00
Xavier	046585020f	Allow hashes in Combination module overload (Closes: #1707)	2019-04-09 21:01:55 +02:00
Xavier Guimard	5862481956	Set master version to 2.1.0	2019-02-12 18:21:38 +01:00
Xavier Guimard	8a3bb7b0f9	Combination override conf (#1151) ... TODO: lot of job in the manager...	2017-02-05 23:04:28 +00:00