Arpit Mohan aeb9ecb8f4 Fixing merge conflicts		2020-08-13 18:59:41 +05:30
..
client	Fixing merge conflicts	2020-08-13 18:59:41 +05:30
server	Bug Fix : When role changes from developer to admin, the user was not being given make application public permission for the application (#302)	2020-08-13 18:53:00 +05:30