snipe e4ceddd6ce Fix for merge conflict on routes

2015-11-30 10:19:37 -08:00

..

commands

Importer fixes - check for asset before inserting

2015-11-24 19:37:37 -08:00

config

Merge branch 'hotfixes/fix_1413' into develop

2015-11-29 16:49:34 -08:00

controllers

Merge pull request #1412 from snipe/same_field_twice

2015-11-29 17:25:11 -08:00

database

Merge branch 'hotfixes/ldap_settings' into develop

2015-11-26 13:11:47 -08:00

lang

Updated language strings

2015-11-25 03:37:48 -08:00

models

Merge branch 'hotfixes/EOL' into develop

2015-11-29 17:11:55 -08:00

private_uploads

Moved sample file so people can't accidentally import it

2015-11-02 16:44:46 -08:00

start

License importer, small tweaks to asset importer

2015-08-14 14:08:34 -07:00

storage

Ignore SQL dumps

2015-06-19 17:31:51 -07:00

tests

Merge branch 'develop' into custom_fields

2015-10-20 17:11:04 -07:00

views

Merge pull request #1412 from snipe/same_field_twice

2015-11-29 17:25:11 -08:00

filters.php

Restrict backups to super users

2015-11-19 09:13:20 +03:00

helpers.php

Merge branch 'develop' into custom_fields

2015-11-25 14:22:22 -08:00

macros.php

Fix ident

2015-11-24 12:30:28 +02:00

routes.php

Fix for merge conflict on routes

2015-11-30 10:19:37 -08:00

validators.php

Merge branch 'develop' into custom_fields

2015-10-20 17:11:04 -07:00