Merge branch 'develop' of github.com:snipe/snipe-it into develop

Browse Source

Conflicts:
	app/views/backend/layouts/default.blade.php

...

This commit is contained in:

snipe

2013-11-20 01:08:50 -05:00

parent fb9f0d837e 171346b5ea

commit 4e9aa99e42

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available