Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Robin de Graaf committed Mar 29, 2016
2 parents eb7fba7 + a36b993 commit 932cb1e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

### 0.3.5 - in progress

...
__Changes__
- Small one, but removed composer.json again. No use for Fluid, which will need an installer like symfony & laravel. For now just releases on github are enough. But I do know how to do it now, so that's something.

### 0.3.4

Expand Down
4 changes: 0 additions & 4 deletions composer.json

This file was deleted.

2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.4
0.3.5

0 comments on commit 932cb1e

Please sign in to comment.