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

Mastarmify #1

Merged
merged 12 commits into from
Nov 16, 2016
Merged

Mastarmify #1

merged 12 commits into from
Nov 16, 2016

Conversation

trevorgerhardt
Copy link
Contributor

No description provided.

@trevorgerhardt
Copy link
Contributor Author

@landonreed ready to be reviewed!

@trevorgerhardt
Copy link
Contributor Author

@landonreed ready to merge?

landonreed and others added 5 commits November 15, 2016 09:55
Conflicts:
	package.json
	src/main/client/common/components/Sidebar.js
	src/main/client/common/components/SidebarNavItem.js
	src/main/client/common/components/SidebarPopover.js
	src/main/client/editor/components/EntityList.js
	src/main/client/editor/components/TimetableEditor.js
	src/main/client/gtfs/components/GtfsMap.js
	src/main/client/manager/components/FeedVersionNavigator.js
	src/main/client/manager/components/FeedVersionReport.js
@landonreed landonreed merged commit a70e023 into dev Nov 16, 2016
@trevorgerhardt trevorgerhardt deleted the mastarmify branch November 17, 2016 05:28
landonreed pushed a commit that referenced this pull request Feb 24, 2017
Mastarmify datatools-manager.
landonreed added a commit that referenced this pull request Dec 7, 2018
binh-dam-ibigroup pushed a commit that referenced this pull request Sep 23, 2021
Merge Dev from upstream
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.

2 participants