Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove some index.js files routing for server/client files #13772

Merged
merged 8 commits into from
Mar 26, 2019

Conversation

rodrigok
Copy link
Member

No description provided.

@rodrigok rodrigok added this to the 1.0.0 milestone Mar 18, 2019
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-13772 March 18, 2019 17:39 Inactive
@sampaiodiego sampaiodiego temporarily deployed to rocket-chat-pr-13772 March 18, 2019 18:55 Inactive
# Conflicts:
#	client/importPackages.js
#	server/importPackages.js
@rodrigok rodrigok temporarily deployed to rocket-chat-pr-13772 March 18, 2019 19:01 Inactive
@rodrigok rodrigok temporarily deployed to rocket-chat-pr-13772 March 18, 2019 19:56 Inactive
@rodrigok rodrigok temporarily deployed to rocket-chat-pr-13772 March 18, 2019 20:22 Inactive
# Conflicts:
#	app/discussion/index.js
#	app/e2e/client/accountEncryption.js
#	app/e2e/client/events.js
#	client/importPackages.js
#	server/importPackages.js
@rodrigok
Copy link
Member Author

@MarcosSpessatto can you review it again? I just fixed some conflicts.

@rodrigok rodrigok merged commit 88c8c8c into develop Mar 26, 2019
@rodrigok rodrigok deleted the remove-shared-files branch March 26, 2019 17:53
@rodrigok rodrigok mentioned this pull request Apr 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants