aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Wielicki <j.wielicki@sotecware.net>2017-10-04 15:51:24 +0200
committerJonas Wielicki <j.wielicki@sotecware.net>2017-10-04 15:51:24 +0200
commit47c51bdce3cffc3d807b96fac7d90bd3d3438366 (patch)
tree51b9118ed50421f2e5e70da87be8e2ede2be2655
parenta651f92159225a63879ca27d867a218f89a6b489 (diff)
parent5172e44892ab1c6a7c044374d7be12a343919d1b (diff)
parentd21ed8e45c563d640c25401153172806e7c4405b (diff)
Merge branches 'feature/xep-0030', 'feature/xep-0385' and 'feature/xep-0392'