Dev master conflicts #645
Merged
Dev master conflicts #645
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Implements markdown and priview functionality
* Initial * Addition of comments section * requested changes
* css changes for jitsi box ui change * edited jitsi.scss for jitsi ui and reverted changes of comment.scss * changes made for making same fonts * added modals in jitsi ui * removed unnecessary code from jitsi.scss
* integrated settings page and user activity modification * configure to deploy
* Adding reactGA * Insights section * removing /hompage path * Requested changes * initial changes * Fetching data from the backend and integrating redux
…o#558) * fixing issues * fixing issues and modify project structure
* Adding pagination to dashboard and minor changes. * Requested changes
Updated Navbar
User Integrations
Integrating post edit share and delete functionalities
User activity
endpoint to my deployed api
small fix for user profile
minor prop fix
Wikis Feature
Updated ReadMe
| @@ -107,9 +115,16 @@ npm install | |||
| The npm install command will install all the project dependencies mentioned in the package.json file. | |||
| Once all the dependencies are completely installed the final step is to run our local instance using the following command. | |||
|
|
|||
| <<<<<<< HEAD | |||
vaibhavdaren
requested changes
Oct 12, 2020
|
@AuraOfDivinity @Rupeshiya Nice work over the summer sending to prod |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixed conflicts on dev -> master merge