Merge branch '0.6.x'

Browse Source

Conflicts:
	converse.min.js

...

This commit is contained in:

JC Brand 2013-10-07 09:22:17 +02:00

parent 4f44be9e29 86eef5b1c2

commit c214000eec

1 changed files with 1 additions and 1 deletions

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

2

converse.min.js vendored

View File

File diff suppressed because one or more lines are too long