Skip to content

Commit 1c996e6

Browse files
author
Vikas Agarwal
committed
Merge branch 'dev' into feature/style-fix-incomplete-project
# Conflicts: # src/projects/create/components/ProjectWizard.scss
2 parents 6be445b + 2b4ce21 commit 1c996e6

36 files changed

+1073
-87
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Install dependencies by running the following in the root of the project:
2929
- **Note:** You must use npm 3. Type `npm -v` to ensure you have a 3.x version.
3030

3131
## NPM Commands
32-
- To run locally, run `npm start` and head to `http://localhost:3000/search/challenges`
32+
- To run locally, run `npm start` and head to `http://localhost:3000/new_project`
3333
- Run tests with `npm test` or use `npm run test:watch` to rerun tests after files change
3434
- To make sure your code passes linting: `npm run lint`
3535
- To create the build: `npm run build`

circle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ compile:
1919

2020
deployment:
2121
development:
22-
branch: dev
22+
branch: [dev]
2323
owner: appirio-tech
2424
commands:
2525
- ./deploy.sh DEV
Lines changed: 27 additions & 0 deletions
Loading
Lines changed: 12 additions & 0 deletions
Loading
Lines changed: 18 additions & 0 deletions
Loading
Lines changed: 14 additions & 0 deletions
Loading
Lines changed: 14 additions & 0 deletions
Loading
Lines changed: 14 additions & 0 deletions
Loading
Lines changed: 22 additions & 0 deletions
Loading
Lines changed: 20 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)