Skip to content
This repository has been archived by the owner on May 16, 2024. It is now read-only.

Dev #10

Merged
merged 6 commits into from
Mar 8, 2018
Merged

Dev #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c22cbfe
change travis yml
astroanu Nov 12, 2016
9876ba0
Merge branch 'master' into dev
astroanu Nov 13, 2016
d076c77
Apply fixes from StyleCI (#5)
astroanu Mar 8, 2018
6e003bc
Update composer.json
astroanu Mar 8, 2018
3594cdf
Update composer.lock
astroanu Mar 8, 2018
7fc8dfe
Merge branch 'master' into dev
astroanu Mar 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"type": "project",
"require": {
"php": ">=5.5.9",
"codebreez/collejo": "1.0.0"
"codebreez/collejo-app": "1.0.1"
},
"require-dev": {
"fzaninotto/faker": "~1.4",
Expand Down Expand Up @@ -46,4 +46,4 @@
"php artisan asset:copy"
]
}
}
}
8 changes: 4 additions & 4 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.