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

Dev backend #3

Merged
merged 46 commits into from
Jan 31, 2019
Merged

Dev backend #3

merged 46 commits into from
Jan 31, 2019

Conversation

zxh326
Copy link
Member

@zxh326 zxh326 commented Jan 31, 2019

No description provided.

srhinee and others added 16 commits January 20, 2019 21:40
* merge faild

* fix

* fix

* xian

* f

* f

* f

* f

* sfd

* xian

* fix

* f

* xian

* f

* xian

* xian

* f

* f

* a

* f

* xian

* add update member

* a

* safety technology

* safety technology

* init database

* continue

* continiue

* technology

* safety technology

* encrypt password

* fix
@zxh326 zxh326 merged commit dedbab0 into test Jan 31, 2019
zxh326 added a commit that referenced this pull request Feb 2, 2019
zxh326 added a commit that referenced this pull request Feb 27, 2019
* fix

* Update README.md

* fix

* update rabc

* Update .travis.yml

* permissions

* update rabc

* re

* modal

* Dev backend (#1)

* permissions

* update rabc

* re

* modal

* fix

* start

* 1

* memeber done

* fix member done

* add material

* material

* stash

* material done

* fix merge conflicts
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