aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Wielicki <j.wielicki@sotecware.net>2017-09-15 18:20:20 +0200
committerJonas Wielicki <j.wielicki@sotecware.net>2017-09-15 18:20:20 +0200
commitfff5868bc4b9fa5e56e2156c8581c632030172b6 (patch)
tree92babc3dbc1915956964eed25c1780b761fea79a
parent3ece586788061af4d26df3e080e0a6ac25f785ba (diff)
parentf9e12ba4a055c0dc06b4986d3e95e4c95c728fb9 (diff)
parent30870a5f40a3054337850fc674074c0c09e6f16d (diff)
parent84d10fe34dab094526bab128f07048d05454579c (diff)
Merge branches 'feature/xep-0065', 'feature/xep-0278', 'feature/xep-0319' and 'feature/xep-0384'