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

Dimitra 6349 #6450

Merged
merged 2 commits into from
May 8, 2020
Merged

Dimitra 6349 #6450

merged 2 commits into from
May 8, 2020

Conversation

Siedlerchr
Copy link
Member

@calixtus I think you forgot to merge the modified branch in master

  • Change in CHANGELOG.md described (if applicable)
  • Tests created for changes (if applicable)
  • Manually tested changed features in running JabRef (always required)
  • Screenshots added in PR description (for UI changes)
  • Checked documentation: Is the information available and up to date? If not created an issue at https://github.com/JabRef/user-documentation/issues or, even better, submitted a pull request to the documentation repository.

dimitra-karadima and others added 2 commits May 8, 2020 23:04
Co-authored-by: Mootez <mootez.saad@medtech.tn>
Co-authored-by: Oliver Kopp <kopp.dev@gmail.com>
@Siedlerchr Siedlerchr merged commit 40f908f into master May 8, 2020
@Siedlerchr Siedlerchr deleted the dimitra-6349 branch May 8, 2020 21:56
@koppor
Copy link
Member

koppor commented May 8, 2020

@Siedlerchr - @calixtus and me were pair-programming and had fun with learning something about git (force push, ammend last commit, ...)

Tutorial. https://lostechies.com/joshuaflanagan/2010/09/03/use-gitk-to-understand-git/

We were just on the way to merge 🎉

Fortunately, you got our new commit 3e20dfb - and not the commit 10 minutes earlier

koppor pushed a commit that referenced this pull request Mar 15, 2023
ca943b70d7 Fix malformed XML in raptor-journal.csl (#6455)
2fad8d1104 Update knee-surgery-sports-traumatology-arthroscopy.csl (#6441)
b4422b77b7 Update guide-des-citations-references-et-abreviations-juridiques.csl (#6450)
cfe85da320 Create raptor-journal.csl (#6451)
afbb963346 Create arkivoc.csl (#6134)
2f21ceb7b4 correct name disambiguation rules (#6442)
5b2191f38b Update bibliothek-forschung-und-praxis.csl (#6437)
aaea3097d1 Update sodertorns-hogskola-oxford.csl (#6439)
e4fbc605f8 Update universite-du-quebec-a-montreal.csl (#6438)
3653118f17 Small Fix to Bio-Protocol

git-subtree-dir: buildres/csl/csl-styles
git-subtree-split: ca943b70d73bd4c57c0b1266ee7c54907b8f9d4f
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.

4 participants