• Thomas Huster's avatar
    Merge remote-tracking branch 'origin/master' into f11106 · fe24708c
    Thomas Huster authored
    Conflicts:
    	bundles/ch.elexis.core.ui.medication/src/ch/elexis/core/ui/medication/views/MedicationComposite.java
    	bundles/ch.elexis.core.ui.medication/src/ch/elexis/core/ui/medication/views/MedicationViewHelper.java
    	bundles/ch.elexis.core.ui/src/ch/elexis/core/ui/views/controls/StickerComposite.java
    	features/ch.elexis.core.application.feature/feature.xml
    fe24708c
Name
Last commit
Last update
..
.settings Loading commit data...
prepare Loading commit data...
.gitignore Loading commit data...
.project Loading commit data...
elexis.target Loading commit data...
elexis.tpd Loading commit data...
pom.xml Loading commit data...