[dreamwidth/dw-free] 820ec6: (bug 5180) Fix warning in merge view

[github]

Branch: refs/heads/develop
Home: https://github.com/dreamwidth/dw-free
Commit: 820ec6227eb186feedcd7fb9c6b35e87819fb4ad
https://github.com/dreamwidth/dw-free/commit/820ec6227eb186feedcd7fb9c6b35e87819fb4ad
Author: exor674 <exor674@dreamwidth.org>
Date: 2013-07-09 (Tue, 09 Jul 2013)

Changed paths:
M cgi-bin/DW/Controller/Admin/Feeds.pm

Log Message:
-----------
(bug 5180) Fix warning in merge view


Commit: 721f22e9f13a20689000b56b85408288110ae6c1
https://github.com/dreamwidth/dw-free/commit/721f22e9f13a20689000b56b85408288110ae6c1
Author: Mark Smith <mark@qq.is>
Date: 2013-07-09 (Tue, 09 Jul 2013)

Changed paths:
M cgi-bin/DW/Controller/Admin/Feeds.pm

Log Message:
-----------
Merge pull request #490 from anall/feature/bug5180

(bug 5180) Fix warning in merge view


Compare: https://github.com/dreamwidth/dw-free/compare/fc88055d2d8e...721f22e9f13a