projects
/
tine20
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0201950
ba1b475
)
Merge branch '2015.11-develop' into 2016.11
author
Philipp Schüle
<p.schuele@metaways.de>
Fri, 2 Sep 2016 11:56:58 +0000
(13:56 +0200)
committer
Philipp Schüle
<p.schuele@metaways.de>
Fri, 2 Sep 2016 11:56:58 +0000
(13:56 +0200)
Change-Id: I3a03c3ed6ccaaefe98d45760b2ba99aedd1d2e61
1
2
tests/tine20/Felamimail/Frontend/JsonTest.php
patch
|
diff1
|
diff2
|
blob
|
history
tests/tine20/Tinebase/Server/JsonTests.php
patch
|
diff1
|
diff2
|
blob
|
history
tine20/Tinebase/Config/KeyField.php
patch
|
diff1
|
diff2
|
blob
|
history
tine20/Tinebase/Setup/DemoData/Abstract.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
tests/tine20/Felamimail/Frontend/JsonTest.php
Simple merge
diff --cc
tests/tine20/Tinebase/Server/JsonTests.php
Simple merge
diff --cc
tine20/Tinebase/Config/KeyField.php
Simple merge
diff --cc
tine20/Tinebase/Setup/DemoData/Abstract.php
Simple merge