Log In
t0xic0der
/
mentored-projects
Forked from
mentored-projects
3 years ago
Clone
Source Code
GIT
Source
Stats
Overview
Files
Commits
Branches
Forks
Releases
36ec0a1
Fix Merge Conflicts.
Merged and Committed by
n0vad3v
4 years ago
raw
patch
tree
parents
569e5d92e58e4aeb852140027d800464c6dd0b55
9a3c6f301b9b3ffe97b43d71a88cdd634be7d9ef
2 files changed.
20 lines added
.
46 lines removed
.
modules/ROOT/pages/gsoc/2019/ideas.adoc
file modified
+15
-41
modules/ROOT/pages/gsoc/2019/index.adoc
file modified
+5
-5
Fix Merge Conflicts.
modules/ROOT/pages/gsoc/2019/ideas.adoc
file modified
+15
-41
modules/ROOT/pages/gsoc/2019/index.adoc
file modified
+5
-5