fix conflit (807c8d05) · Commits · IF3111-2019-Crystal / Scrumify-Server · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

S

Scrumify-Server
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Container Registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

IF3111-2019-Crystal
Scrumify-Server
Commits
807c8d05

Commit 807c8d05 authored 6 years ago by

Muhammad Farhan

Downloads
- Plain Diff

fix conflit

parents 81f0cc62 ce1c4b8e

Branches

Tags

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/Http/Controllers/TasksMemberController.php 33 additions, 5 deletions

app/Http/Controllers/TasksMemberController.php
app/Http/Controllers/UserController.php 1 addition, 1 deletion

app/Http/Controllers/UserController.php
app/TasksMember.php 1 addition, 1 deletion

app/TasksMember.php
database/migrations/2019_02_19_141233_create_tasks_member_table.php 2 additions, 2 deletions

...igrations/2019_02_19_141233_create_tasks_member_table.php
routes/api.php 13 additions, 8 deletions

routes/api.php

with 50 additions and 17 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment