tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 11:05:53 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.2' into 4

Browse Source
This commit is contained in:
Damian Mooyman 2018-06-15 16:32:48 +12:00
commit 9b239fd9a3
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -32,8 +32,7 @@
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"4.x-dev": "4.2.x-dev", "4.x-dev": "4.3.x-dev"
"dev-master": "5.x-dev"
}, },
"expose": [ "expose": [
"javascript" "javascript"

7
lang/sv.yml Normal file
View File

@ -0,0 +1,7 @@
sv:
SilverStripe\Reports\ReportAdmin:
MENUTITLE: Rapporter
ReportTitle: Titel
SilverStripe\Reports\SideReport:
OtherGroupTitle: Annat
REPEMPTY: 'Rapporten {title} är tom.'