[dreamwidth/dw-free] 653f6c: Merge branch 'release-1.11.0' into develop

[github]

Branch: refs/heads/master
Home: https://github.com/dreamwidth/dw-free
Commit: 653f6c8b967e73b74add8b399d87a9cd0d470950
https://github.com/dreamwidth/dw-free/commit/653f6c8b967e73b74add8b399d87a9cd0d470950
Author: mark <mark@dreamwidth.org>
Date: 2012-09-22 (Sat, 22 Sep 2012)

Changed paths:
M bin/upgrading/en.dat
M htdocs/stc/entrypage.css
R htdocs/stc/entryreplypage.css

Log Message:
-----------
Merge branch 'release-1.11.0' into develop


Commit: 0b83b9bffc64ded32ce81c34c6c3476a9d9762e1
https://github.com/dreamwidth/dw-free/commit/0b83b9bffc64ded32ce81c34c6c3476a9d9762e1
Author: Afuna <fu@dreamwidth.org>
Date: 2012-09-22 (Sat, 22 Sep 2012)

Changed paths:
M htdocs/stc/jquery.iconselector.css

Log Message:
-----------
(Bug 4385) Don't force a width for small icons with no meta text


Commit: 0e41ad83f0bae2fc40097221072870013a379f24
https://github.com/dreamwidth/dw-free/commit/0e41ad83f0bae2fc40097221072870013a379f24
Author: Afuna <fu@dreamwidth.org>
Date: 2012-09-22 (Sat, 22 Sep 2012)

Changed paths:
M cgi-bin/Apache/LiveJournal.pm

Log Message:
-----------
Resolve favicon.ico, which is in dw-nonfree


Commit: 478b798d5fc31149f85d3b96e5832a64dc0d56d6
https://github.com/dreamwidth/dw-free/commit/478b798d5fc31149f85d3b96e5832a64dc0d56d6
Author: Afuna <fu@dreamwidth.org>
Date: 2012-09-22 (Sat, 22 Sep 2012)

Changed paths:
M cgi-bin/Apache/LiveJournal.pm
M htdocs/stc/jquery.iconselector.css

Log Message:
-----------
Merge branch 'release-1.11.0'

* release-1.11.0:
Resolve favicon.ico, which is in dw-nonfree
(Bug 4385) Don't force a width for small icons with no meta text


Compare: https://github.com/dreamwidth/dw-free/compare/c51fd67a2963...478b798d5fc3