Revision c70480ff46b1a13eef97797f7307ad7abf55d5b4

Committed on 22/01/2015 7:53 am by Madeline VEYRENC <madeline.veyrenc@openwide.fr> [GitHub Diff]

Merge branch 'feature/add-remove-options' of https://github.com/Open-Wide/OWEnhancedSelection into feature/add-remove-options

Conflicts:
datatypes/owenhancedselection/owenhancedselectionbasicoption.php