git://git.onelab.eu / playground.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 7ebbb52)
Merge remote-tracking branch 'origin/generic'
authorGit User <support@planet-lab.org>
Mon, 29 Sep 2014 10:31:37 +0000 (06:31 -0400)
committerGit User <support@planet-lab.org>
Mon, 29 Sep 2014 10:31:37 +0000 (06:31 -0400)
generic.txt [new file with mode: 0644] patch | blob

diff --git a/generic.txt b/generic.txt
new file mode 100644 (file)
index 0000000..6e8c89b
--- /dev/null
+++ b/generic.txt
@@ -0,0 +1 @@
+adding another branch called generic
playground