8000 Template de page "Study Plan" by alinekeller · Pull Request #499 · epfl-si/elements · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Template de page "Study Plan" #499

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

Merged
merged 14 commits into from
Mar 19, 2021
Merged

Template de page "Study Plan" #499

merged 14 commits into from
Mar 19, 2021

Conversation

alinekeller
Copy link
Contributor

No description provided.

Copy link
Member
@jdelasoie jdelasoie left a comment

Choose a reason for hiding this comment

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

Ok, je merge dès que les conflits sont résolus

@alinekeller
Copy link
Contributor Author

@jdelasoie Git s'est un peu emmêlé les pinceaux, aucune raison que ça fasse des conflits 🤨 J'ai mergé dev dans ma branche en local et corrigé les "conflits", ça me semble tout bon.

@jdelasoie
Copy link
Member

Parfait, merci !

@jdelasoie jdelasoie merged commit c9d8a5d into dev Mar 19, 2021
@jdelasoie jdelasoie deleted the feature/study-plan-page branch March 19, 2021 09:40
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.

2 participants
0