View | Details | Raw Unified | Return to bug 7143
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt (-61 / +84 lines)
Lines 92-98 Link Here
92
                <li><strong><a href="http://www.ensmp.fr">ENSMP (Ecole Nationale Supérieure des Mines de Paris)</a></strong>, France (biblio frameworks, MARC authorities, OPAC basket, Serials sponsorship)</li>
92
                <li><strong><a href="http://www.ensmp.fr">ENSMP (Ecole Nationale Supérieure des Mines de Paris)</a></strong>, France (biblio frameworks, MARC authorities, OPAC basket, Serials sponsorship)</li>
93
                <li><strong><a href="http://www.mediathequeouestprovence.fr/">SAN-Ouest Provence</a></strong>, France (Koha 3.0 enhancements to patrons and holds modules)</li>
93
                <li><strong><a href="http://www.mediathequeouestprovence.fr/">SAN-Ouest Provence</a></strong>, France (Koha 3.0 enhancements to patrons and holds modules)</li>
94
                <li>The <strong><a href="http://ccfls.org">Crawford County Federated Library System</a></strong>, PA, USA (Koha 3.0 Zebra Integration sponsorship)</li>
94
                <li>The <strong><a href="http://ccfls.org">Crawford County Federated Library System</a></strong>, PA, USA (Koha 3.0 Zebra Integration sponsorship)</li>
95
				<li>The <strong><a href="http://www.geauga.lib.oh.us/">Geauga County Public Library</a></strong>, OH, USA (Koha 3.0 beta testing)</li>
95
                <li>The <strong><a href="http://www.geauga.lib.oh.us/">Geauga County Public Library</a></strong>, OH, USA (Koha 3.0 beta testing)</li>
96
                <li>The <strong><a href="http://library.neu.edu.tr">Near East University</a></strong>, Cyprus</li>
96
                <li>The <strong><a href="http://library.neu.edu.tr">Near East University</a></strong>, Cyprus</li>
97
                <li><strong>OPUS International Consultants</strong>, Wellington, New Zealand (Corporate Serials sponsorship)</li>
97
                <li><strong>OPUS International Consultants</strong>, Wellington, New Zealand (Corporate Serials sponsorship)</li>
98
                <li><strong><a href="http://www.famfamfam.com/">famfamfam.com</a></strong> Birmingham (UK) based developer Mark James for the famfamfam Silk iconset.</li>
98
                <li><strong><a href="http://www.famfamfam.com/">famfamfam.com</a></strong> Birmingham (UK) based developer Mark James for the famfamfam Silk iconset.</li>
Lines 102-136 Link Here
102
            <ul>
102
            <ul>
103
               <li><strong>Colin Campbell</strong> (Koha 3.4 QA Manager)</li>
103
               <li><strong>Colin Campbell</strong> (Koha 3.4 QA Manager)</li>
104
               <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544614260">Galen Charlton</a></strong> (Koha 3.2 Release Manager)</li>
104
               <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544614260">Galen Charlton</a></strong> (Koha 3.2 Release Manager)</li>
105
	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544609030">Chris Cormack</a></strong> (Koha 1.x, 3.4, 3.6 Release Manager, Koha 3.2 Translation Manager)</li>
105
               <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544609030">Chris Cormack</a></strong> (Koha 1.x, 3.4, 3.6 Release Manager, Koha 3.2 Translation Manager)</li>
106
	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6620692210484">Frédéric Demians</a></strong>(Koha 3.4, 3.6 Translation Manager)</li>
106
               <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6620692210484">Frédéric Demians</a></strong>(Koha 3.4, 3.6 Translation Manager)</li>
107
	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544646984">Nicole C. Engard</a></strong> (Koha 3.x Documentation Manager)</li>
107
               <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544646984">Nicole C. Engard</a></strong> (Koha 3.x Documentation Manager)</li>
108
	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544609053">Joshua Ferraro</a></strong> (Koha 3.0 Release Manager &amp; Translation Manager)</li>
108
               <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544609053">Joshua Ferraro</a></strong> (Koha 3.0 Release Manager &amp; Translation Manager)</li>
109
	           <li><strong>Rachel Hamilton-Williams</strong> (Kaitiaki from 2004 to present)</li>
109
               <li><strong>Rachel Hamilton-Williams</strong> (Kaitiaki from 2004 to present)</li>
110
	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544614275">Henri-Damien Laurent</a></strong> (Koha 3.0 Release Maintainer)</li>
110
               <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544614275">Henri-Damien Laurent</a></strong> (Koha 3.0 Release Maintainer)</li>
111
	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544609147">Owen Leonard</a></strong> (Koha 3.x Interface Design)</li>
111
               <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544609147">Owen Leonard</a></strong> (Koha 3.x Interface Design)</li>
112
               <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544615991">Chris Nighswonger</a></strong> (Koha 3.2, 3.4 Release Maintainer, Koha 3.6 Release Maintainer)</li>
112
               <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544615991">Chris Nighswonger</a></strong> (Koha 3.2, 3.4 Release Maintainer, Koha 3.6 Release Maintainer)</li>
113
	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544612249">Paul Poulain</a></strong> (Koha 2.0 Release Manager, Koha 2.2 Release Manager/Maintainer, Koha 3.8 Release Manager)</li>
113
               <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544612249">Paul Poulain</a></strong> (Koha 2.0 Release Manager, Koha 2.2 Release Manager/Maintainer, Koha 3.8 Release Manager)</li>
114
	           <li><strong><a href="http://www.ohloh.net/p/koha/contributors/6620692116417">MJ Ray</a></strong> (Koha 2.0 Release Maintainer)</li>
114
               <li><strong><a href="http://www.ohloh.net/p/koha/contributors/6620692116417">MJ Ray</a></strong> (Koha 2.0 Release Maintainer)</li>
115
                <li><strong>Ian Walls</strong> Koha 3.6 QA Manager, Koha 3.8 QA Manager</li>
115
                <li><strong>Ian Walls</strong> Koha 3.6 QA Manager, Koha 3.8 QA Manager</li>
116
                </ul>
116
                </ul>
117
            <h2>Koha Development Team</h2>
117
            <h2>Koha Development Team</h2>
118
			<ul>
118
            <ul>
119
                <li>Md. Aftabuddin</li>
119
                <li>Md. Aftabuddin</li>
120
		<li>Edward Allen</li>
120
                <li>Edward Allen</li>
121
                <li>Francisco M. Marzoa Alonso</li>
121
                <li>Francisco M. Marzoa Alonso</li>
122
                <li>Cindy Murdock Ames</li>
122
                <li>Cindy Murdock Ames</li>
123
                <li>Richard Anderson</li>
123
                <li>Richard Anderson</li>
124
                <li><a href="https://www.ohloh.net/p/koha/contributors/6620692181851">Nahuel Angelinetti</a></li>
124
                <li><a href="https://www.ohloh.net/p/koha/contributors/6620692181851">Nahuel Angelinetti</a></li>
125
		<li>Nuño López Ansótegui</li>
125
                <li>Nuño López Ansótegui</li>
126
		<li>Tomás Cohen Arazi</li>
126
             <li>Tomás Cohen Arazi</li>
127
                <li><a href="https://www.ohloh.net/p/koha/contributors/6620692124662">Andrew Arensburger (the small and great C4::Context module)</a></li>
127
                <li><a href="https://www.ohloh.net/p/koha/contributors/6620692124662">Andrew Arensburger (the small and great C4::Context module)</a></li>
128
                <li>Alex Arnaud</li>
128
                <li>Alex Arnaud</li>
129
                <li><a href="https://www.ohloh.net/p/koha/contributors/6618544614259">Joe Atzberger</a></li>
129
                <li><a href="https://www.ohloh.net/p/koha/contributors/6618544614259">Joe Atzberger</a></li>
130
                <li>Larry Baerveldt</li>
130
                <li>Larry Baerveldt</li>
131
                <li>Al Banks</li>
131
                <li>Al Banks</li>
132
                <li>Daniel Banzli</li>
132
                <li>Daniel Banzli</li>
133
		<li>Greg Barniskis</li>
133
                 <li>Greg Barniskis</li>
134
                <li>Benedykt P. Barszcz (Polish for 2.0)</li>
134
                <li>Benedykt P. Barszcz (Polish for 2.0)</li>
135
                <li>D Ruth Bavousett</li>
135
                <li>D Ruth Bavousett</li>
136
                <li>John Beppu</li>
136
                <li>John Beppu</li>
Lines 139-169 Link Here
139
                <li>Danny Bouman</li>
139
                <li>Danny Bouman</li>
140
                <li>Stan Brinkerhoff</li>
140
                <li>Stan Brinkerhoff</li>
141
                <li>Roger Buck</li>
141
                <li>Roger Buck</li>
142
		<li>Steven Callender</li>
142
                <li>Steven Callender</li>
143
                <li><a href="https://www.ohloh.net/p/koha/contributors/6620692376789">Jared Camins-Esakov</a></li>
143
                <li><a href="https://www.ohloh.net/p/koha/contributors/6620692376789">Jared Camins-Esakov</a></li>
144
                <li>Colin Campbell</li>
144
                <li>Colin Campbell</li>
145
		<li>Fernando Canizo</li>
145
                <li>Fernando Canizo</li>
146
		<li>Frédérick Capovilla</li>
146
                <li>Frédérick Capovilla</li>
147
                <li>DeAndre Carroll</li>
147
                <li>DeAndre Carroll</li>
148
                <li>Chris Catalfo (new plugin MARC editor)</li>
148
                <li>Chris Catalfo (new plugin MARC editor)</li>
149
                <li>Marc Chantreux</li>
149
                <li>Marc Chantreux</li>
150
		<li>Jerome Charaoui</li>
150
                <li>Jerome Charaoui</li>
151
                <li>Andrew Chilton</li>
151
                <li>Andrew Chilton</li>
152
                <li>Garry Collum</li>
152
                <li>Garry Collum</li>
153
		<li>John Copeland</li>
153
                <li>John Copeland</li>
154
		<li>Jeremy Crabtree</li>
154
                <li>Jeremy Crabtree</li>
155
		<li>Christophe Croullebois</li>
155
                <li>Christophe Croullebois</li>
156
                <li>Nate Curulla</li>
156
                <li>Nate Curulla</li>
157
                <li>Vincent Danjean</li>
157
                <li>Vincent Danjean</li>
158
                <li>Elliott Davis</li>
158
                <li>Elliott Davis</li>
159
		<li>Doug Dearden</li>
159
                <li>Doug Dearden</li>
160
                <li>Kip DeGraaf</li>
160
                <li>Kip DeGraaf</li>
161
                <li>Connor Dewar</li>
161
                <li>Connor Dewar</li>
162
                <li><a href="https://www.ohloh.net/p/koha/contributors/6620692210484">Frédéric Demians</a></li>
162
                <li><a href="https://www.ohloh.net/p/koha/contributors/6620692210484">Frédéric Demians</a></li>
163
		<li>Jonathan Druart</li>
163
                <li>Jonathan Druart</li>
164
		<li>Serhij Dubyk</li>
164
                <li>Serhij Dubyk</li>
165
                <li>Thomas Dukleth (MARC Frameworks Maintenance)</li>
165
                <li>Thomas Dukleth (MARC Frameworks Maintenance)</li>
166
		<li>Frederic Durand</li>
166
                <li>Frederic Durand</li>
167
                <li>Sebastiaan Durand</li>
167
                <li>Sebastiaan Durand</li>
168
                <li>Ecole des Mines de Saint Etienne, Philippe Jaillon (OAI-PMH support)</li>
168
                <li>Ecole des Mines de Saint Etienne, Philippe Jaillon (OAI-PMH support)</li>
169
                <li>Stephen Edwards</li>
169
                <li>Stephen Edwards</li>
Lines 171-194 Link Here
171
                <li>Brian Engard</li>
171
                <li>Brian Engard</li>
172
                <li><a href="https://www.ohloh.net/p/koha/contributors/6618544677502">Magnus Enger</a></li>
172
                <li><a href="https://www.ohloh.net/p/koha/contributors/6618544677502">Magnus Enger</a></li>
173
                <li>Esiee School (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)</li>
173
                <li>Esiee School (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)</li>
174
		<li>Shaun Evans</li>
174
                <li>Shaun Evans</li>
175
                <li>Pat Eyler (Kaitiaki from 2002 to 2004)</li>
175
                <li>Pat Eyler (Kaitiaki from 2002 to 2004)</li>
176
                <li><a href="https://www.ohloh.net/p/koha/contributors/6618544609865">Antoine Farnault</a></li>
176
                <li><a href="https://www.ohloh.net/p/koha/contributors/6618544609865">Antoine Farnault</a></li>
177
                <li><a href="https://www.ohloh.net/p/koha/contributors/6618544670742">Katrin Fischer</a></li>
177
                <li><a href="https://www.ohloh.net/p/koha/contributors/6618544670742">Katrin Fischer</a></li>
178
                <li>Clay Fouts</li>
178
                <li>Clay Fouts</li>
179
		<li>Claudia Forsman</li>
179
                <li>Claudia Forsman</li>
180
                <li>Marco Gaiarin</li>
180
                <li>Marco Gaiarin</li>
181
                <li>Pierrick Le Gall</li>
181
                <li>Pierrick Le Gall</li>
182
                <li>Brendan A. Gallagher</li>
182
                <li>Brendan A. Gallagher</li>
183
                <li>Tumer Garip</li>
183
                <li>Tumer Garip</li>
184
                <li>Russel Garlick</li>
184
                <li>Russel Garlick</li>
185
		<li>Mark Gavillet</li>
185
                <li>Mark Gavillet</li>
186
                <li>Daniel Kahn Gillmor</li>
186
                <li>Daniel Kahn Gillmor</li>
187
                <li>David Goldfein</li>
187
                <li>David Goldfein</li>
188
                <li>Daniel Grobani</li>
188
                <li>Daniel Grobani</li>
189
                <li>Amit Gupta</li>
189
                <li>Amit Gupta</li>
190
                <li>Michael Hafen</li>
190
                <li>Michael Hafen</li>
191
		<li>Christopher Hall</li>
191
                <li>Christopher Hall</li>
192
                <li>Mike Hansen</li>
192
                <li>Mike Hansen</li>
193
                <li>Brian Harrington</li>
193
                <li>Brian Harrington</li>
194
                <li>Friedrich zur Hellen</li>
194
                <li>Friedrich zur Hellen</li>
Lines 196-202 Link Here
196
                <li>Wolfgang Heymans</li>
196
                <li>Wolfgang Heymans</li>
197
                <li><a href="https://www.ohloh.net/p/koha/contributors/6618544614261">Ryan Higgins</a></li>
197
                <li><a href="https://www.ohloh.net/p/koha/contributors/6618544614261">Ryan Higgins</a></li>
198
                <li>Sèbastien Hinderer</li>
198
                <li>Sèbastien Hinderer</li>
199
		<li>Stephanie Hogan</li>
199
                <li>Stephanie Hogan</li>
200
                <li>Daniel Holth</li>
200
                <li>Daniel Holth</li>
201
                <li>Andrew Hooper</li>
201
                <li>Andrew Hooper</li>
202
                <li>Matthew Hunt</li>
202
                <li>Matthew Hunt</li>
Lines 207-215 Link Here
207
                <li><a href="https://www.ohloh.net/accounts/kohaaloha">Mason James</a></li>
207
                <li><a href="https://www.ohloh.net/accounts/kohaaloha">Mason James</a></li>
208
                <li>Mike Johnson</li>
208
                <li>Mike Johnson</li>
209
                <li>Donovan Jones</li>
209
                <li>Donovan Jones</li>
210
		<li>Janusz Kaczmarek</li>
210
                <li>Janusz Kaczmarek</li>
211
                <li>Koustubha Kale</li>
211
                <li>Koustubha Kale</li>
212
		<li>Ulrich Kleiber</li>
212
                <li>Ulrich Kleiber</li>
213
                <li>Arnaud Laurin</li>
213
                <li>Arnaud Laurin</li>
214
                <li>Ambrose Li (translation tool)</li>
214
                <li>Ambrose Li (translation tool)</li>
215
                <li>Gynn Lomax</li>
215
                <li>Gynn Lomax</li>
Lines 218-241 Link Here
218
                <li>Jesse Maseto</li>
218
                <li>Jesse Maseto</li>
219
                <li>Frère Sébastien Marie</li>
219
                <li>Frère Sébastien Marie</li>
220
                <li>Ricardo Dias Marques</li>
220
                <li>Ricardo Dias Marques</li>
221
		<li>Julian Maurice</li>
221
                <li>Julian Maurice</li>
222
                <li>Brig C. McCoy</li>
222
                <li>Brig C. McCoy</li>
223
                <li>Dorian Meid (German translation)</li>
223
                <li>Dorian Meid (German translation)</li>
224
		<li>Meenakshi. R</li>
224
                <li>Meenakshi. R</li>
225
                <li>Matthias Meusburger</li>
225
                <li>Matthias Meusburger</li>
226
		<li>Sophie Meynieux</li>
226
                <li>Sophie Meynieux</li>
227
                <li>Alan Millar</li>
227
                <li>Alan Millar</li>
228
                <li><a href="https://www.ohloh.net/p/koha/contributors/6618544607803">Andrew Moore</a></li>
228
                <li><a href="https://www.ohloh.net/p/koha/contributors/6618544607803">Andrew Moore</a></li>
229
                <li>Sharon Moreland</li>
229
                <li>Sharon Moreland</li>
230
                <li>Nicolas Morin</li>
230
                <li>Nicolas Morin</li>
231
 		<li>Mike Mylonas</li>
231
                 <li>Mike Mylonas</li>
232
 		<li>Joy Nelson</li>
232
                 <li>Joy Nelson</li>
233
                <li><a href="https://www.ohloh.net/accounts/cnighswonger">Chris Nighswonger</a></li>
233
                <li><a href="https://www.ohloh.net/accounts/cnighswonger">Chris Nighswonger</a></li>
234
		<li>Albert Oller</li>
234
                <li>Albert Oller</li>
235
		<li>Eric Olsen</li>
235
                <li>Eric Olsen</li>
236
		<li>H. Passini</li>
236
                <li>H. Passini</li>
237
		<li>Dobrica Pavlinusic</li>
237
                <li>Dobrica Pavlinusic</li>
238
		<li>Maxime Pelletier</li>
238
                <li>Maxime Pelletier</li>
239
                <li>Polytechnic University</li>
239
                <li>Polytechnic University</li>
240
                <li><a href="https://www.ohloh.net/p/koha/contributors/6620692116417">MJ Ray</a></li>
240
                <li><a href="https://www.ohloh.net/p/koha/contributors/6620692116417">MJ Ray</a></li>
241
                <li>Liz Rea</li>
241
                <li>Liz Rea</li>
Lines 244-297 Link Here
244
                <li>Serge Renaux</li>
244
                <li>Serge Renaux</li>
245
                <li>Waylon Robertson</li>
245
                <li>Waylon Robertson</li>
246
                <li>Marcel de Rooy</li>
246
                <li>Marcel de Rooy</li>
247
		<li>Salvador Zaragoza Rubio</li>
247
                <li>Salvador Zaragoza Rubio</li>
248
		<li>Brice Sanchez</li>
248
                <li>Brice Sanchez</li>
249
		<li>Sam Sanders</li>
249
                <li>Sam Sanders</li>
250
                <li><a href="https://www.ohloh.net/p/koha/contributors/6618544619438">Robin Sheat</a></li>
250
                <li><a href="https://www.ohloh.net/p/koha/contributors/6618544619438">Robin Sheat</a></li>
251
		<li>John Seymour</li>
251
                <li>John Seymour</li>
252
		<li>Juan Romay Sieira</li>
252
                <li>Juan Romay Sieira</li>
253
		<li>Zach Sim</li>
253
                <li>Zach Sim</li>
254
                <li>Savitra Sirohi</li>
254
                <li>Savitra Sirohi</li>
255
                <li>Pawel Skuza (Polish for 1.2)</li>
255
                <li>Pawel Skuza (Polish for 1.2)</li>
256
                <li>Fridolyn Somers</li>
256
                <li>Fridolyn Somers</li>
257
                <li>Southeastern University</li>
257
                <li>Southeastern University</li>
258
                <li>Glen Stewart</li>
258
                <li>Glen Stewart</li>
259
		<li>Will Stokes</li>
259
                <li>Will Stokes</li>
260
                <li>David Strainchamps</li>
260
                <li>David Strainchamps</li>
261
                <li>Ed Summers (Some code and Perl packages like MARC::Record)</li>
261
                <li>Ed Summers (Some code and Perl packages like MARC::Record)</li>
262
                <li>Daniel Sweeney</li>
262
                <li>Daniel Sweeney</li>
263
                <li>Zeno Tajoli</li>
263
                <li>Zeno Tajoli</li>
264
                <li>Adam Thick</li>
264
                <li>Adam Thick</li>
265
	        <li><a href="https://www.ohloh.net/p/koha/contributors/6618544609107">Finlay Thompson</a></li>
265
                <li><a href="https://www.ohloh.net/p/koha/contributors/6618544609107">Finlay Thompson</a></li>
266
                <li><a href="https://www.ohloh.net/p/koha/contributors/6620692101577">Steve Tonnesen (early MARC work, Virtual Bookshelves concept, KohaCD)</a></li>
266
                <li><a href="https://www.ohloh.net/p/koha/contributors/6620692101577">Steve Tonnesen (early MARC work, Virtual Bookshelves concept, KohaCD)</a></li>
267
                <li>Bruno Toumi</li>
267
                <li>Bruno Toumi</li>
268
                <li>Andrei V. Toutoukine</li>
268
                <li>Andrei V. Toutoukine</li>
269
                <li>Darrell Ulm</li>
269
                <li>Darrell Ulm</li>
270
                <li>Universidad ORT Uruguay (Ernesto Silva, Andres Tarallo)</li>
270
                <li>Universidad ORT Uruguay (Ernesto Silva, Andres Tarallo)</li>
271
<<<<<<< HEAD
271
                <li>Aleksa Vujicic</li>
272
                <li>Aleksa Vujicic</li>
272
		<li>Reed Wade</li>
273
		<li>Reed Wade</li>
273
		<li>Ian Walls</li>
274
		<li>Ian Walls</li>
275
=======
276
                <li>Reed Wade</li>
277
                <li>Ian Walls</li>
278
>>>>>>> Bug 7143 about.tt indentation fixes
274
                <li><a href="http://www.ohloh.net/accounts/janewagner">Jane Wagner</a></li>
279
                <li><a href="http://www.ohloh.net/accounts/janewagner">Jane Wagner</a></li>
275
		<li>Ward van Wanrooij</li>
280
                <li>Ward van Wanrooij</li>
276
                <li><a href="https://www.ohloh.net/accounts/pianohacker">Jesse Weaver</a></li>
281
                <li><a href="https://www.ohloh.net/accounts/pianohacker">Jesse Weaver</a></li>
277
                <li>Rick Welykochy</li>
282
                <li>Rick Welykochy</li>
278
		<li>Piotr Wejman</li>
283
                <li>Piotr Wejman</li>
279
                <li>Ron Wickersham</li>
284
                <li>Ron Wickersham</li>
280
		<li>Brett Wilkins</li>
285
                <li>Brett Wilkins</li>
281
                <li><a href="https://www.ohloh.net/p/koha/contributors/6620692127299">Olwen Williams (Database design and data extraction for Koha 1.0)</a></li>
286
                <li><a href="https://www.ohloh.net/p/koha/contributors/6620692127299">Olwen Williams (Database design and data extraction for Koha 1.0)</a></li>
282
                <li>James Winter</li>
287
                <li>James Winter</li>
283
                <li>Lars Wirzenius</li>
288
                <li>Lars Wirzenius</li>
284
			</ul>
289
            </ul>
285
            <h3>Contributing Companies and Institutions</h3>
290
            <h3>Contributing Companies and Institutions</h3>
286
            <ul>
291
            <ul>
287
                <li><strong>BibLibre</strong>, France</li>
292
                <li><strong>BibLibre</strong>, France</li>
288
                <li><strong>Bibliotheksservice-Zentrum Baden-Württemberg (BSZ)</strong>, Germany</li>
293
                <li><strong>Bibliotheksservice-Zentrum Baden-Württemberg (BSZ)</strong>, Germany</li>
289
		<li><strong>ByWater Solutions</strong>, USA</li>
294
                <li><strong>ByWater Solutions</strong>, USA</li>
290
		<li><strong>Calyx</strong>, Australia</li>
295
                <li><strong>Calyx</strong>, Australia</li>
291
		<li><strong>Catalyst IT</strong>, New Zealand</li>
296
                <li><strong>Catalyst IT</strong>, New Zealand</li>
292
                <li><strong>Katipo Communications</strong>, New Zealand</li>
297
                <li><strong>Katipo Communications</strong>, New Zealand</li>
293
                <li><strong>KohaAloha</strong>, New Zealand</li>
298
                <li><strong>KohaAloha</strong>, New Zealand</li>
294
                <li><strong>LibLime</strong>, USA</li>
299
                <li><strong>LibLime</strong>, USA</li>
300
<<<<<<< HEAD
295
                <li><strong>Libriotech</strong>, Norway</li>
301
                <li><strong>Libriotech</strong>, Norway</li>
296
		<li><strong>Nelsonville Public Library</strong>, Ohio, USA</li>
302
		<li><strong>Nelsonville Public Library</strong>, Ohio, USA</li>
297
		<li><strong>PTFS</strong>, Maryland, USA</li>
303
		<li><strong>PTFS</strong>, Maryland, USA</li>
Lines 301-314 Link Here
301
		<li><strong>Software Coop</strong>, United Kingdom</li>
307
		<li><strong>Software Coop</strong>, United Kingdom</li>
302
		<li><strong>Tamil</strong>, France</li>
308
		<li><strong>Tamil</strong>, France</li>
303
		<li><strong>Xercode</strong>, Spain</li>
309
		<li><strong>Xercode</strong>, Spain</li>
310
=======
311
                <li><strong>Libriotech</strong>, Norway</li> 
312
                <li><strong>Nelsonville Public Library</strong>, Ohio, USA</li>
313
                <li><strong>PTFS</strong>, Maryland, USA</li>
314
                <li><strong>PTFS Europe Ltd</strong>, United Kingdom</li>
315
                <li><strong>Rijksmuseum</strong>, Amsterdam, The Netherlands</li>
316
                <li><strong>SAN-Ouest Provence</strong>, France</li>
317
                <li><strong>Software Coop</strong>, United Kingdom</li>
318
                <li><strong>Tamil</strong>, France</li>
319
                <li><strong>Xercode</strong>, Spain</li>
320
>>>>>>> Bug 7143 about.tt indentation fixes
304
            </ul>
321
            </ul>
305
322
306
            <h2>Additional Thanks To...</h2>
323
            <h2>Additional Thanks To...</h2>
307
            <ul>
324
            <ul>
308
	    <li>Jo Ransom</li>
325
                <li>Jo Ransom</li>
309
                <li>Nicholas Rosasco, (Documentation Compiler)</li>
326
                <li>Nicholas Rosasco, (Documentation Compiler)</li>
310
                <li>Regula Sebastiao</li>
327
                <li>Regula Sebastiao</li>
311
		<li>Brooke Johnson</li>
328
                <li>Brooke Johnson</li>
312
                <li>Stephen Hedges (early Documentation Manager)</li>
329
                <li>Stephen Hedges (early Documentation Manager)</li>
313
                <li>Nicolas Morin (French Translation in 2.0)</li>
330
                <li>Nicolas Morin (French Translation in 2.0)</li>
314
            </ul>
331
            </ul>
Lines 387-392 Link Here
387
<li><strong>T&uuml;rk&ccedil;e (Turkish)</strong> Selma Aslan</li>
404
<li><strong>T&uuml;rk&ccedil;e (Turkish)</strong> Selma Aslan</li>
388
<li><strong>&#1575;&#1585;&#1583;&#1608;(Urdu)</strong> Ata ur Rehman</li>
405
<li><strong>&#1575;&#1585;&#1583;&#1608;(Urdu)</strong> Ata ur Rehman</li>
389
<li><strong>&#1059;&#1082;&#1088;&#1072;&#1111;&#1085;&#1089;&#1100;&#1082;&#1072; (Ukrainian)</strong> Victor Titarchuk and Serhij Dubyk</li>
406
<li><strong>&#1059;&#1082;&#1088;&#1072;&#1111;&#1085;&#1089;&#1100;&#1082;&#1072; (Ukrainian)</strong> Victor Titarchuk and Serhij Dubyk</li>
407
<<<<<<< HEAD
390
            </ul>
408
            </ul>
391
409
392
        </div>
410
        </div>
Lines 413-417 Link Here
413
431
414
    </div>
432
    </div>
415
433
434
=======
435
</ul>
436
437
</div>
438
</div>
439
>>>>>>> Bug 7143 about.tt indentation fixes
416
</div></div></div>
440
</div></div></div>
417
[% INCLUDE 'intranet-bottom.inc' %]
441
[% INCLUDE 'intranet-bottom.inc' %]
418
- 

Return to bug 7143