Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 734289d0 authored by Marten Gajda's avatar Marten Gajda
Browse files

Merge branch 'material' into material_details 

Conflicts:
	src/org/dmfs/tasks/model/DefaultModel.java
	src/org/dmfs/tasks/model/FieldDescriptor.java
	src/org/dmfs/tasks/model/XmlModel.java
parents 4d71f8f3 80755fba
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment