Skip to content

Conversation

@ehhc
Copy link
Contributor

@ehhc ehhc commented May 29, 2018

… in the same note folder -> Fixes #1924

@kazup01 kazup01 added awaiting review ❇️ Pull request is awaiting a review. awaiting changes 🖊️ Pull request has been reviewed, but contributor needs to make changes. and removed awaiting review ❇️ Pull request is awaiting a review. labels May 30, 2018
…ste_storage_link_should_clone_attachment

# Conflicts:
#	browser/components/CodeEditor.js
#	browser/main/lib/dataApi/attachmentManagement.js
@ehhc
Copy link
Contributor Author

ehhc commented Jun 5, 2018

@kazup01 could you review it? it can be merged automatically again :)

@kazup01
Copy link
Member

kazup01 commented Jun 6, 2018

Hi @ehhc , thanks for your contribution! Could you fix conflicts?

…ste_storage_link_should_clone_attachment

# Conflicts:
#	browser/main/lib/dataApi/attachmentManagement.js
#	locales/da.json
#	locales/de.json
#	locales/en.json
#	locales/es-ES.json
#	locales/fa.json
#	locales/fr.json
#	locales/hu.json
#	locales/it.json
#	locales/ja.json
#	locales/ko.json
#	locales/no.json
#	locales/pl.json
#	locales/pt-BR.json
#	locales/pt-PT.json
#	locales/ru.json
#	locales/sq.json
#	locales/zh-CN.json
#	locales/zh-TW.json
@ehhc
Copy link
Contributor Author

ehhc commented Jun 6, 2018

@kazup01 done

@kazup01 kazup01 added awaiting review ❇️ Pull request is awaiting a review. and removed awaiting changes 🖊️ Pull request has been reviewed, but contributor needs to make changes. labels Jun 6, 2018
@Rokt33r Rokt33r merged commit 57befc4 into BoostIO:master Jun 8, 2018
@Rokt33r Rokt33r added next release (v0.11.6) and removed awaiting review ❇️ Pull request is awaiting a review. labels Jun 8, 2018
@ehhc ehhc deleted the paste_storage_link_should_clone_attachment branch June 8, 2018 07:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants