diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-06-18 15:16:20 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-06-18 15:16:20 +0200 |
| commit | 3fd4ccf165562323ff5a8f81ef55932eb6c883be (patch) | |
| tree | 4d12898a0bcece3769a0b6905a2febd661120096 | |
| parent | 7eb30b4e60d28b8e5f2562de518946d066cbe28e (diff) | |
| parent | 1dd7597cac9904aceb26646ae60399ef16e72530 (diff) | |
| download | test2-3fd4ccf165562323ff5a8f81ef55932eb6c883be.tar.bz2 test2-3fd4ccf165562323ff5a8f81ef55932eb6c883be.tar.xz | |
Merge branch 'testbranch'
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | test.txt | 2 |
2 files changed, 8 insertions, 0 deletions
@@ -6,3 +6,9 @@ testing hooks Add commit to master branch +Another commit + +add commit to branch testbranch + + +release 0.4 diff --git a/test.txt b/test.txt new file mode 100644 index 0000000..76e579a --- /dev/null +++ b/test.txt @@ -0,0 +1,2 @@ +test + |