Merge branch 'master' of https://git.kingpenguin.tk/chteufleur/HTTPAuthentificationOverXMPP

Browse Source

Conflicts:
	httpAuth.cfg

...

This commit is contained in:

Chteufleur 2016-08-21 21:24:50 +02:00

parent c788a29d46 0b0611fc45

commit 89efb0137b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available