Skip to content
Commit c9e92527 authored by Daniel Espinosa's avatar Daniel Espinosa
Browse files

Merge remote-tracking branch 'origin/master' into serialization 

Conflicts:
	gxml/Serializable.vala
	gxml/Serialization.vala
	test/DocumentTest.vala
Keeps changes on Serializable and Serialization from serializable
branch.
parents fc2852bf 7d0fc9a3
Hide 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