Skip to content
  • benoit's avatar
    Merge origin/master · 08567c66
    benoit authored
    Conflicts:
    	db/ora_tables.sql
    	nbproject/project.properties
    	web/WEB-INF/tags/dgmSpot.tag
    	web/theme/css/theme.css
    	web/theme/less/theme.less
    	web/theme/less/variables.less
    08567c66
This project is licensed under the GNU General Public License v3.0 only. Learn more