changelog | [dreamwidth/dw-free] 678e0b: Resolve merge conflict (#2348)

Branch: refs/heads/develop
Home: https://github.com/dreamwidth/dw-free
Commit: 678e0b9ea26791778e5f6d219ebbb7b066429191
https://github.com/dreamwidth/dw-free/commit/678e0b9ea26791778e5f6d219ebbb7b066429191
Author: kaberett <kaberett@gmail.com>
Date: 2018-06-17 (Sun, 17 Jun 2018)

Changed paths:
M bin/upgrading/proplists.dat
M cgi-bin/DW/External/Site/Imzy.pm
M cgi-bin/DW/Logic/ProfilePage.pm
A htdocs/img/external/imzy.png
R htdocs/img/profile_icons/imzy.png
M htdocs/manage/profile/index.bml
M htdocs/manage/profile/index.bml.text
M htdocs/profile.bml.text

Log Message:
-----------
Resolve merge conflict (#2348)

**NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

Functionality will be removed from GitHub.com on January 31st, 2019.