diff --git a/app/config/version.php b/app/config/version.php index be2c5aaf1a23..afca9e90e1a9 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v1.2.7-9', - 'hash_version' => 'v1.2.7-9-g68d8b10', + 'app_version' => 'v1.2.7-10', + 'hash_version' => 'v1.2.7-10-g71febc1', ); \ No newline at end of file diff --git a/app/lang/en/admin/locations/table.php b/app/lang/en/admin/locations/table.php index 7d1f49c81850..d2fd2800b58b 100755 --- a/app/lang/en/admin/locations/table.php +++ b/app/lang/en/admin/locations/table.php @@ -9,7 +9,7 @@ 'id' => 'ID', 'locations' => 'Locations', 'name' => 'Location Name', - 'parent' => 'Parent Location', + 'parent' => 'Parent', 'state' => 'State', 'update' => 'Update Location', 'zip' => 'Postal Code', diff --git a/app/views/backend/locations/index.blade.php b/app/views/backend/locations/index.blade.php index aa4f33a11c50..56fbfdba76f6 100755 --- a/app/views/backend/locations/index.blade.php +++ b/app/views/backend/locations/index.blade.php @@ -23,7 +23,7 @@ @lang('admin/locations/table.name') @lang('admin/locations/table.parent') - @lang('admin/locations/table.assets') + @lang('general.assets') @lang('admin/locations/table.address') @lang('admin/locations/table.city'), @lang('admin/locations/table.state')