diff options
| author | Frederic Guillot <fred@kanboard.net> | 2016-02-13 19:28:17 -0500 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2016-02-13 19:28:17 -0500 |
| commit | 8768918bbe36e6a051491c0fe283033608ae3c91 (patch) | |
| tree | 57af571ce500341ba0eb8321ce2e83bfaee1fd2c /app/Model/User.php | |
| parent | 738b6ae5832fb7c2992ec0dc52399e4dbf3d096d (diff) | |
| parent | 1a5dfa7035a1de79491794e8c45967c86cd48c91 (diff) | |
Merge pull-request #1838 and solve conflict
Diffstat (limited to 'app/Model/User.php')
0 files changed, 0 insertions, 0 deletions