Commit Graph

2 Commits

Author SHA1 Message Date
Mike Ng
3dd4c50350 Merge branch 'master-alchemy' into PHRAS-1735_add_git_log
# Conflicts:
#	resources/www/common/js/components/common.js
2018-01-08 16:26:28 +04:00
Xavier Rousset
1683191d19 PHRAS-1719 Add presets selection on subdef admin page 2017-12-13 01:58:36 +01:00