Commit 616240ed authored by Shashank Kumar's avatar Shashank Kumar

Merge branch 'master' into 'adding-signing-feature'

# Conflicts:
#   changelog
#   docs/developer.md
#   main.py
#   modules/signup/signup.py
parents 63b0484c d6b46042
v0.0.1
## June 11 2018 ( Shashank Kumar )
- Adding Dashboard feature
......
......@@ -106,8 +106,6 @@ There are two type of testing being done for this application.
- `test_services.py` - contains tests for `modules/signup/services.py`
- `test_utils.py` - contains tests for `modules/signup/utils.py`
- `test_validation.py` - contains tests for `modules/signup/validations.py`
<<<<<<< HEAD
### SignIn Module
......@@ -126,8 +124,6 @@ There are two type of testing being done for this application.
- `test_services.py` - contains tests for `modules/signin/services.py`
- `test_utils.py` - contains tests for `modules/signin/utils.py`
- `test_validation.py` - contains tests for `modules/signin/validations.py`
=======
>>>>>>> d6b460424e6b55369e231ec38aae947e963f3dc8
### The Dashboard
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment