repo.or.cz
/
koha.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Release notes for 3.20.15
2016-09-21
Ch
r
is
C
ormack
Release notes fo
r
3
.
20
.
1
5
commit
|
commitdiff
|
tree
2016-09-21
Chri
s
Cormack
B
u
mping version
n
umber to 3
.
20
.
15
commit
|
commitdiff
|
tree
2016-09-21
Chris C
o
rmack
Translation updates
commit
|
commitdiff
|
tree
2016-08-31
Jon
a
than Druart
Bug 1
7
02
5
: Fix XSS
i
n
serials-se
a
rch
.
pl
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-08-31
Jonathan Druart
Bug 17021: Fix XSS
i
n circ/ret
u
rns
.
pl
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-08-31
Chris Cormack
Bug
1
6969
cg
i
->param used in list
context in
opac-memberentry
.
pl
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-08-22
C
hris Corm
a
ck
Re
l
ea
s
e notes for 3
.
20
.
14
commit
|
commitdiff
|
tree
2016-08-22
C
h
r
is Cormack
Bu
m
p
i
ng v
e
rsion number
to 3
.
20
.
14
commit
|
commitdiff
|
tree
2016-08-22
Chris Corma
c
k
PO file updates
commit
|
commitdiff
|
tree
2016-08-22
Jonathan D
r
uart
B
ug
1
7
0
29: Fix XSS
i
n cat
a
lo
g
ue/*de
t
ail
.
pl
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2016-08-22
Jonath
a
n Druart
Bug
17036: Fix XSS
in circ
u
lation
.
pl
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2016-08-22
Jo
n
athan
Druart
B
ug 17038: Fix XSS in
c
atalogue/sea
r
ch
.
pl
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2016-08-08
Ch
r
i
s Cormack
FIxi
n
g a typ
o
that wa
s
b
u
st
i
ng the upgrade
commit
|
commitdiff
|
tree
2016-08-08
Jon
a
t
han Druart
Bug 17022:
F
ix XSS in acq
u
i/z3950_sear
c
h
.
pl
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-08-08
Jonathan D
r
uart
Bug 17023: Fix XSS in
ca
t
aloguing/z3950_search
.
pl
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-08-08
Chris
Cormack
Bug
16975 : @INC sho
u
ld n
o
t have '
.
' as i
t
s
l
ast entry
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2016-08-08
Jonathan
Druart
Bug
1
7
0
2
2
: Fix
X
SS in circ/branchtr
a
nsf
e
rs
.
pl
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2016-08-08
Chri
s
Cormack
Bug 17026 XSS in c
h
eckexpir
a
tion
.
pl
commit
|
commitdiff
|
tree
2016-08-08
Jonathan Druart
Bug 17028: F
i
x
X
SS in reserv
e
/
req
u
est
.
pl
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2016-08-03
Jonatha
n
D
r
uar
t
Bug 16587: Same fixes f
o
r the st
a
ff interface
commit
|
commitdiff
|
tree
2016-08-03
Ch
r
is Cormack
B
u
g 16587 opac-sendshelf
.
pl
i
s vulnerable to X
S
S
commit
|
commitdiff
|
tree
2016-08-03
Chr
i
s C
o
rmack
Bug 16587 - opac-s
e
ndb
a
s
k
et
.
pl
i
s
open to XSS
commit
|
commitdiff
|
tree
2016-08-03
Jon
a
than Druart
Bug 1659
3
: D
o
not a
l
low patrons to
d
ele
t
e sea
r
ch his
t
ory
.
.
.
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-08-03
J
onathan Druart
Bug
1
6958: Fix XSS in
o
pac-image
v
iewer
.
pl
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-08-03
Jonathan Druart
Bug 16
4
76: Do not c
a
l
l CGI->param in lis
t
contex
t
,
.
.
.
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-07-24
C
h
ris Cormack
Release notes for 3
.
20
.
13
commit
|
commitdiff
|
tree
2016-07-24
C
h
r
i
s Cormack
Up
d
atin
g
versio
n
number to 3
.
20
.
13
commit
|
commitdiff
|
tree
2016-07-24
C
hri
s
Cormack
PO file upda
t
es for
3
.
20
.
13
commit
|
commitdiff
|
tree
2016-07-07
Tomas Cohen Arazi
Bug 16
7
20: R
e
mov
e
DBIx
A
c
tionL
o
gs
.
pm
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-07-07
Marcel de Rooy
B
u
g 16502: Replace a few o
t
her ok-cal
l
s by is-cal
l
s
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-07-07
Marcel de R
o
oy
Bug 1650
2
: Adjus
t
test f
o
r Ge
t
Plugins
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-07-07
Marcel
de Ro
o
y
B
ug 16502: Add additional test to
P
l
u
gins
.
t
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-07-07
Marcel
d
e
R
ooy
Bug 16502: Table koha_plugin_com_bywatersoluti
o
n
s
_kitchensi
n
.
.
.
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-06-22
Chris Cor
m
ack
Re
l
ease notes
for
3
.
20
.
12
commit
|
commitdiff
|
tree
2016-06-22
Chris Cormack
Bumping
version numb
e
r for release
commit
|
commitdiff
|
tree
2016-06-22
Chr
i
s Corma
c
k
Tran
s
lation updates for
3
.
20
.
1
2
commit
|
commitdiff
|
tree
2016-06-22
C
hris Corma
c
k
Merge tag 'v3
.
20
.
11
'
into fix_3
.
20
.
x
commit
|
commitdiff
|
tree
2016-06-21
Chris Corm
a
c
k
Bu
g
16597:
Fix XSS in
opa
c
-share
s
hel
f
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-06-21
Jonathan D
r
ua
r
t
Bug 16599:
Fix other po
t
e
n
tials X
S
S
f
or shelfna
m
e
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-06-21
Jo
n
at
h
an Druart
Bug 16599: Fi
x
XSS in opac-shareshelf
.
p
l
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-06-20
Chris Cormack
B
u
g 16220 : Updat
e
d min
i
fied css
commit
|
commitdiff
|
tree
2016-06-20
Owen L
e
onard
B
u
g
1
62
2
0 -
The view tab
s
o
n opac-detai
l
.
p
l are not
.
.
.
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-06-20
O
w
e
n Leonard
Bug 16159 - guarantor section mi
s
sing ID on patron
.
.
.
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-06-20
J
o
nathan
D
ruart
Bug 1
6
407: Simp
l
ify comments
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-06-20
Marcel de
Roo
y
Bug 16407: Fix Koha_bo
r
rower_modifications
.
t
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-06-20
J
u
l
ian Maurice
Bug 16709: Fo
l
lowup of
bug 11038 for 3
.
20
.
x only
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-06-20
Chris
C
ormack
F
i
xing number of
tests in
t/db_
d
ep
e
ndent/Members
.
t
commit
|
commitdiff
|
tree
2016-06-19
Owen Leonard
Bug 16315 - OPAC Shelfbrowser does
n
't d
i
s
p
lay the full
.
.
.
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-06-19
Nick Clemens
Bug
1
5682
-
Only al
l
ow mer
g
ing of
2 or mor
e
record
s
.
.
.
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.z>
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-06-19
Nick
C
lemens
Bug 1568
2
- Merging
rec
o
rds from cataloguin
g
se
a
r
c
h
.
.
.
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.z>
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-06-19
Ow
e
n Leonard
Bug 15194 - Drop-down menu 'Actions' has problem in
.
.
.
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-06-19
Jonathan Druart
Bug 146
3
2:
A
dd Cop
y
right
f
or th
e
Koha Dev Team
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-06-19
Mark T
o
mpset
t
B
u
g 14362: R
e
gression te
s
ts
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-06-19
Mark T
o
mpsett
Bug 14362
:
PEGI15 Cir
c
ulation/AgeRestrictionMar
k
ers
.
.
.
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-06-19
Alex Arnaud
Bug 13
8
77 - Fix QA issues
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-06-19
Alex
Ar
n
aud
B
ug 13
8
7
7 -
Make serialseq
s
eason name translatable
.
.
.
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.z>
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-06-19
Jul
i
an Mau
r
ic
e
Bug 13
0
4
1: Fix add of ba
s
ket's
mana
g
e
r
wh
e
n na
m
e contain
s
.
.
.
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-06-19
M
a
rc Véron
Bug 1272
1
: (followup) Replac
e
mysq
l
ism by DBIx::Class
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-06-19
Marc Vér
o
n
B
ug 12721
- Prevent softwa
r
e error if
i
ncorrect
fieldnames
.
.
.
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-06-19
Marc Véron
Bug 12721 - Syspref StatisticsFields: Warning on About
.
.
.
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-06-19
J
onathan Dr
u
art
Bug 16426: fol
l
ow-up o
f
bug 1584
0
-
c
o
r
rectly manage
.
.
.
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-06-19
Jonathan Drua
r
t
B
ug 16426:
A
d
d
test
s
for M
o
d
Member - do not update
.
.
.
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2016-06-19
Jonathan Druart
Bug 12752: FI
X
l
etter
names in
3
.
15
.
00
.
041
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.z>
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2015-11-08
Frid
o
lin Somers
Bug 14671: Allow
c
orrect transl
a
tion of CAS
authenti
c
ation
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2015-11-08
J
o
n
athan Druart
Bug 10181:
A
cq -
I
m
p
r
ove message for de
l
eted records
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2015-11-08
Jonathan Druart
Bug 1
0
1
81: Make
stri
n
g
translatable
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2015-10-27
Chris
C
o
rmack
Bumping versio
n
n
u
mber for 3
.
20
.
5
commit
|
commitdiff
|
tree
2015-10-27
Ch
r
is Cormack
Rel
e
ase note
s
commit
|
commitdiff
|
tree
2015-10-27
Magnus
E
nger
Bug
15042: Ba
r
c
o
d
e hby
y
mmincr does not wo
r
k when r
e
c
eiving
.
.
.
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2015-10-24
Mar
k
Tomps
e
tt
B
u
g 15027: Cor
r
ect T
y
p
e
in C4::I
t
ems perldoc
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2015-10-24
Jonathan
Dru
a
r
t
Bug
15012: use sud
o
instead of su in ko
h
a
-shell
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2015-10-24
F
ridolin S
o
mers
B
u
g
14154: 608$9 defined
twice in UNIMARC bi
b
lio-koha
.
.
.
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2015-10-24
Jo
n
athan Dr
u
a
rt
Bug 150
2
9
:
M
a
k
e
the IssueSli
p
tes
t
s
pass
e
ven if launch
e
d
.
.
.
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2015-10-24
Kyle
M Hall
Bug
1
4
9
37
:
Expirati
o
n
date for holds based o
n
Reserve
s
MaxPi
c
k
.
.
.
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2015-10-24
Jonat
h
an Druart
B
u
g 11298
:
Don't force the renew t
i
me to 23:59
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2015-10-24
Jonathan D
r
uart
B
ug 1
4
990: Format the d
a
te
t
emplat
e
-side fo
r
mo
r
e
member
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2015-10-24
Rafal
Kopaczka
Bu
g
14
9
66: Table header b
r
o
ke
n
at d
e
tail
.
tt
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2015-10-24
Fr
i
dol
i
n Somers
Bug
1
4
653:
Acq
p
lann
i
ng export always
u
s
e default active
.
.
.
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2015-10-24
F
r
idolin Somers
Bug 14653
:
Acq planning filter always use default active
.
.
.
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2015-10-23
Barton Chittenden
Bug 14
8
58: remove
d
r
eco
r
d l
e
ngth limit
t
est
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2015-10-23
Jonathan Drua
r
t
Bug 14950
:
Fix day formatting
i
f <
10
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2015-10-23
J
onat
h
a
n
Druart
Bu
g
14950: R
e
move u
n
u
s
ed va
r
iable $tod
a
y_is
o
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2015-10-23
Marc
V
é
r
on
Bug 14950: Ass
i
g
n def
a
ult value for YYYY, MM and DD
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2015-10-23
Julia
n
Mau
r
ic
e
Bug 149
4
0: F
i
x sorting
i
n opac-top
i
ssues
.
pl
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2015-10-23
Jonathan Druart
Bug
14
5
28: Inconsistency in permissions c
h
eck when
.
.
.
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2015-10-23
Jonathan Dru
a
rt
Bug
1
4
871:
Ext
e
nd the patrons search to s
e
arch
l
i
ke
.
.
.
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2015-10-23
Lar
i
Taskula
Bug 14880
:
Ke
y
boar
d
shortcuts do
n
't work a
f
ter se
t
ting
.
.
.
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2015-10-23
J
o
nathan Druart
Bu
g
1
4812: Display t
h
e help in the c
o
rrec
t
language
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2015-10-23
David Cook
Bug
1486
1
: Accession date c
o
mp
a
r
ison do
e
s not wor
k
.
.
.
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2015-10-23
Jonathan Druart
Bug 1
4
141: F
i
x
c
o
p
y
act
i
on
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2015-10-23
J
ona
t
han Druart
B
ug
14
1
41: Do not let
e
dit
the branch wh
e
n
u
pdating
.
.
.
Signed-off-by:
Chris Cormack
<chris@bigballofwax.co.nz>
commit
|
commitdiff
|
tree
2015-10-23
Jonathan Druart
Bug 14811
:
Don't update permane
n
t_loc
a
tion with CART
.
.
.
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2015-10-23
T
omas Cohen Arazi
Bug 14820: DBRev
3
.
20
.
04
.
0
01
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2015-10-23
Jonat
h
a
n Druart
Bug 14820:
A
dd missing pr
e
fs
SMSSend
U
sername and SMSS
e
ndPassword
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2015-10-23
Jonathan Druart
Bug 14910: Redirect
t
o the circulation module
a
fter
.
.
.
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2015-10-23
M
a
r
c Vér
o
n
Bug 149
2
9:
Fix missing
d
isplay of help pa
g
e in contrac
t
.
.
.
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2015-10-23
Jo
n
athan D
r
uart
Bu
g
14832:
Fix
e
nco
d
ing issues
wh
e
n exporting in R
I
S
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2015-10-23
Jon
a
than Druart
Bug 14884: Adjust the
n
umber o
f
t
e
sts
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2015-10-23
Robin
Sheat
Bu
g
14
8
84: remo
v
e
spurious
c
onflict
m
arkers
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
2015-10-11
Jonathan Druar
t
Bug 12311: Do not
r
etu
r
n a lost it
e
m if modified in
.
.
.
Signed-off-by:
Chris Cormack
<chrisc@catalyst.net.nz>
commit
|
commitdiff
|
tree
next