Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

Browse source

* remotes/upstream/master:
  fix html reshares when editplain in use

* master:

...

This commit is contained in:

Simon L'nu 2012-03-06 18:38:44 -05:00

parent a33ca0a731 496a0ce4d1

commit 415ca107fd

6 changed files with 15 additions and 7 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

BIN

images/beard.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 989 B

BIN

images/smiley-beard.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1,021 B

BIN

images/smiley-whitebeard.png Normal file

View file

Binary file not shown.

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

BIN

images/whitebeard.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 951 B