Skip to main content
Homepage
Explore
Search or go to…
/
Register
Sign in
Explore
Primary navigation
Project
S
SnipeIt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Collapse sidebar
Snippets
Groups
Projects
Show more breadcrumbs
OskarStenberg
SnipeIt
Commits
13d250f0
Commit
13d250f0
authored
Jul 19, 2016
by
snipe
Browse files
Options
Downloads
Plain Diff
Merge branch 'v3' of github.com:snipe/snipe-it into v3
# Conflicts: # app/Models/Ldap.php
parents
7e569344
68d8e6a3
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/Console/Commands/ObjectImportCommand.php
+5
-5
5 additions, 5 deletions
app/Console/Commands/ObjectImportCommand.php
app/Models/Ldap.php
+0
-1
0 additions, 1 deletion
app/Models/Ldap.php
resources/views/hardware/import.blade.php
+2
-2
2 additions, 2 deletions
resources/views/hardware/import.blade.php
with
7 additions
and
8 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
