Merge remote-tracking branch 'upstream/master'

Browse source

...

This commit is contained in:

Artem Sheremet 2012-03-17 02:11:13 +03:00

parent 6b3012f8d7 c398f857d9

commit 5ea6583374

88 changed files with 3694 additions and 2496 deletions

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

Download patch file Download diff file Expand all files Collapse all files

0

plugins/ejabberd/ejabberd_scanlog → plugins/ejabberd/ejabberd_scanlog/ejabberd_scanlog

Unescape Escape View file

BIN

plugins/ejabberd/ejabberd_scanlog/ejabberd_scanlog.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 36 KiB