Commit Graph

1 Commits

Author SHA1 Message Date
nathan
82103dd514 * Collabora: Merge placeholder dialogs
Added merge placeholder & address dialogs to Collabora.  Also some new merge preferences for target filename and location, and placeholder list UI
2021-10-14 13:18:21 -06:00