Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Institut-Ebre/2DAM2015_16
Browse files Browse the repository at this point in the history
  • Loading branch information
deltcod committed Sep 28, 2015
2 parents 0f2befa + 699c971 commit 60ff27e
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Alexlliso/helloworld → Alexlliso/helloworld.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/php
<?php

echo "Hello World\n";
Empty file added DanielDolz/helloworld.php
Empty file.
Empty file added FrancescFores/helloworld.php
Empty file.

0 comments on commit 60ff27e

Please sign in to comment.