Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge changes to add @manez to committers. #1613

Merged
merged 2 commits into from
Sep 9, 2020

Conversation

rosiel
Copy link
Member

@rosiel rosiel commented Sep 9, 2020

Purpose / why

Updates the main branch with commits that were only on master.

@jordandukart many thanks for the quick work on #1612!

But... I forgot to git commit after fixing the merge conflict, so this re-adds @manez .

One of you want to merge?

manez
manez previously approved these changes Sep 9, 2020
@manez manez dismissed their stale review September 9, 2020 18:22

missed something

Copy link
Member

@manez manez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The list is alphabetical, so my entry should be at the top (for now. I've got my eye on you @qadan 👀 )

@rosiel
Copy link
Member Author

rosiel commented Sep 9, 2020

Thanks for that catch @manez !

@manez manez merged commit 94f16a4 into Islandora:main Sep 9, 2020
@rosiel rosiel deleted the main-update-2 branch September 9, 2020 19:03
dannylamb added a commit that referenced this pull request Sep 11, 2020
* Merge changes to add @manez to committers.

* Alphabeticalize committer names.

Co-authored-by: dannylamb <dlamb@islandora.ca>
whikloj pushed a commit that referenced this pull request Sep 30, 2020
* Render the example helpful tip properly. (#1586)

* Render the example helpful tip properly.

* Fix note syntax, again.

* Mention the User Call (#1587)

* Update rdf-mapping.md doc (#1585)

* Update committers.md (#1592)

* Fix committer nomination email address (#1593)

* Fix old email address.

* Update closeCommitterVote.txt

* De-CLAW

* De-CLAW

* DeCLAW

* Change email

* De-CLAW

* Update travis for the main branch switch (#1594)

* Master -> Main Rename

* Remove comments about WebAC (#1555)

* Remove comments about WebAC

WebAC is not used but is listed as a feature added when using Fedora. Although it is there, I'd suggest leaving off of this documentation.

* Update user-intro.md

* Add more details about starting up an islandora. (#1597)

* Add more details about starting up an islandora.

* Update index.md

* Mention use of dev branch for prebuilt base box

* Update index.md

* Fix typo in VBE

* Make clearer the different levels of sandbox reqs.

* Update CONTRIBUTING.md (#1601)

* Add Jordan to committers list (#1602)

* Migration docs updates (#1603)

* Added link to newer migration Youtube vid, added migration-overview.md

* Replaced used of "*" with "-" for bulleted lists

* Updated headings in docs and spelling changes

* Main update (#1612)

* Render the example helpful tip properly. (#1586)

* Render the example helpful tip properly.

* Fix note syntax, again.

* Update rdf-mapping.md doc (#1585)

Co-authored-by: Eli Zoller <5439169+elizoller@users.noreply.github.com>

* Merge changes to add @manez to committers. (#1613)

* Merge changes to add @manez to committers.

* Alphabeticalize committer names.

Co-authored-by: dannylamb <dlamb@islandora.ca>

* De-CLAWing

* Derp

* Missing parenthesis

Co-authored-by: Rosie Le Faive <lefaive@gmail.com>
Co-authored-by: Eli Zoller <5439169+elizoller@users.noreply.github.com>
Co-authored-by: Jonathan Green <jonathan.green@lyrasis.org>
Co-authored-by: Don Richards <DonRichards@utk.edu>
Co-authored-by: Melissa Anez <manez@islandora.ca>
Co-authored-by: Yamil <ysuarez@users.noreply.github.com>
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