[dreamwidth/dw-free] 9b9f75: (bug 1716) "syn_merge" not "synmerge"

[github]

Branch: refs/heads/release-1.17
Home: https://github.com/dreamwidth/dw-free
Commit: 9b9f752730cd34346275748631dcf5a0bf9f22f7
https://github.com/dreamwidth/dw-free/commit/9b9f752730cd34346275748631dcf5a0bf9f22f7
Author: exor674 <exor674@dreamwidth.org>
Date: 2013-07-18 (Thu, 18 Jul 2013)

Changed paths:
M views/admin/feeds/merge.tt

Log Message:
-----------
(bug 1716) "syn_merge" not "synmerge"


Commit: 7318b911b8ccee30266c3f7e73bad647df90dd41
https://github.com/dreamwidth/dw-free/commit/7318b911b8ccee30266c3f7e73bad647df90dd41
Author: exor674 <exor674@dreamwidth.org>
Date: 2013-07-18 (Thu, 18 Jul 2013)

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

Log Message:
-----------
(bug 1716) use canonical username in merge interface lookups


Commit: 9241c2004bb64f79b38a4ec59c66ecfe9eeea25c
https://github.com/dreamwidth/dw-free/commit/9241c2004bb64f79b38a4ec59c66ecfe9eeea25c
Author: Mark Smith <mark@qq.is>
Date: 2013-07-18 (Thu, 18 Jul 2013)

Changed paths:
M cgi-bin/DW/Controller/Admin/Feeds.pm
M views/admin/feeds/merge.tt

Log Message:
-----------
Merge pull request #511 from anall/feature/bug1716

Fix two issues with feed merge admin interface.


Compare: https://github.com/dreamwidth/dw-free/compare/a874947ef5b6...9241c2004bb6