.gitignore · cc1eaaccc1e183b36a856bc626d14402469f27f0 · UPSMF / uphrh-SunbirdEd-portal-old · GitLab

Aug 31, 2020
a644a99c
Merge branch 'release-3.3.0' of https://github.com/Sunbird-Ed/SunbirdEd-portal into logging-winston · a644a99c
anoophm authored Aug 31, 2020
```
# Conflicts:
#	.gitignore
#	src/app/proxy/proxyUtils.js
#	src/app/resourcebundles/json/en.json
#	src/app/server.js
```
a644a99c
Merge branch 'release-3.3.0' of https://github.com/Sunbird-Ed/SunbirdEd-portal into logging-winston
anoophm authored Aug 31, 2020
```
# Conflicts:
#	.gitignore
#	src/app/proxy/proxyUtils.js
#	src/app/resourcebundles/json/en.json
#	src/app/server.js
```