Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity
f3101a347f
xmpp.chapril.org-conversejs/docs/.gitattributes
JC Brand 04912c5c5a Merge branch 'master' into amd-strophe 
Conflicts:
	docs/CHANGES.rst
2015-02-22 12:53:18 +01:00

2 lines
24 B
Plaintext
Raw Blame History

CHANGES.rst merge=union
Reference in New Issue View Git Blame Copy Permalink