Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
uphrh-SunbirdEd-portal-old
Commits
8c959e50
Unverified
Commit
8c959e50
authored
4 years ago
by
Vinu Kumar
Committed by
GitHub
4 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #4115 from anoophm/release-3.0-merge
Issue 0000 fix: resolved merge conflicts
parents
c33d7d59
f12c90fa
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/app/client/src/app/modules/groups/services/groups/groups.service.ts
+1
-1
.../src/app/modules/groups/services/groups/groups.service.ts
src/app/client/src/app/modules/public/module/explore/components/explore-curriculum-courses/explore-curriculum-courses.component.ts
+1
-1
...urriculum-courses/explore-curriculum-courses.component.ts
src/app/client/src/app/modules/public/module/explore/explore-routing.module.ts
+1
-1
...p/modules/public/module/explore/explore-routing.module.ts
src/app/client/src/app/modules/workspace/components/data-driven/data-driven.component.ts
+1
-12
...workspace/components/data-driven/data-driven.component.ts
with
4 additions
and
15 deletions
+4
-15
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets
