projects
/
cloudstore.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4b627f8
e7b1646
)
Merge branch 'master' of git.rot13.org:/git/cloudstore
author
Dobrica Pavlinusic
<dpavlin@rot13.org>
Wed, 11 Apr 2012 16:54:22 +0000
(18:54 +0200)
committer
Dobrica Pavlinusic
<dpavlin@rot13.org>
Wed, 11 Apr 2012 17:09:54 +0000
(19:09 +0200)
Conflicts:
t/API.t
1
2
lib/CloudStore/API.pm
patch
|
diff1
|
diff2
|
blob
|
history
t/API.t
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/CloudStore/API.pm
Simple merge
diff --cc
t/API.t
index
7a22ef8
,
0b31f9c
..
ecfe29a
---
1
/
t/API.t
---
2
/
t/API.t
+++ b/
t/API.t
@@@
-2,7
-2,7
+2,7
@@@
use strict;
use warnings;
- use Test::More tests => 25;
-use Test::More tests => 27;
++use Test::More tests => 26;
use Data::Dump qw(dump);
use lib 'lib';