Skip to content

Pulling dev branch into master before uploading to gh-pages#43

Merged
m-sara merged 145 commits intomasterfrom
dev
Nov 5, 2016
Merged

Pulling dev branch into master before uploading to gh-pages#43
m-sara merged 145 commits intomasterfrom
dev

Conversation

@dkulp23
Copy link
Owner

@dkulp23 dkulp23 commented Nov 5, 2016

No description provided.

m-sara and others added 30 commits October 27, 2016 18:16
connected stylesheet to html ugh
…allLocations to local storage and redirect to reservation page.
dkulp23 and others added 27 commits November 3, 2016 21:14
Checking for conflicts with current dev branch before pushing.
@m-sara m-sara merged commit b32ebfe into master Nov 5, 2016
@m-sara m-sara removed the in progress label Nov 5, 2016
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.

3 participants