Merge branch 'develop'

This commit is contained in:
snipe 2017-10-07 08:00:11 -07:00
commit 27ab0271a1

View file

@ -167,7 +167,7 @@
'settings' => 'Settings', 'settings' => 'Settings',
'sign_in' => 'Sign in', 'sign_in' => 'Sign in',
'signature' => 'Signature', 'signature' => 'Signature',
'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.', 'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation, and the data in this system will reset daily.',
'site_name' => 'Site Name', 'site_name' => 'Site Name',
'state' => 'State', 'state' => 'State',
'status_labels' => 'Status Labels', 'status_labels' => 'Status Labels',