<feed xmlns='http://www.w3.org/2005/Atom'>
<title>project/web/dev, branch master</title>
<subtitle>Tor dev website</subtitle>
<link rel='alternate' type='text/html' href='https://gitweb.torproject.org/project/web/dev.git/'/>
<entry>
<title>Fix merge conflicts again</title>
<updated>2020-11-25T14:46:41+00:00</updated>
<author>
<name>hiro</name>
<email>hiro@torproject.org</email>
</author>
<published>2020-11-25T14:46:41+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.torproject.org/project/web/dev.git/commit/?id=9c45347efc6dd76d7674d3dbe4ec280d387a2224'/>
<id>9c45347efc6dd76d7674d3dbe4ec280d387a2224</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix merge conflict</title>
<updated>2020-11-25T14:44:16+00:00</updated>
<author>
<name>hiro</name>
<email>hiro@torproject.org</email>
</author>
<published>2020-11-25T14:44:16+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.torproject.org/project/web/dev.git/commit/?id=d62d51ac215756aba11df215febec5114f81b23d'/>
<id>d62d51ac215756aba11df215febec5114f81b23d</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix structure and templates</title>
<updated>2020-11-25T14:28:46+00:00</updated>
<author>
<name>hiro</name>
<email>hiro@torproject.org</email>
</author>
<published>2020-11-25T14:28:46+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.torproject.org/project/web/dev.git/commit/?id=a521daa019796a0d31ca258e1c32ea659ad33155'/>
<id>a521daa019796a0d31ca258e1c32ea659ad33155</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Make it build</title>
<updated>2020-11-24T18:14:33+00:00</updated>
<author>
<name>hiro</name>
<email>hiro@torproject.org</email>
</author>
<published>2020-11-24T18:14:33+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.torproject.org/project/web/dev.git/commit/?id=7a699899bbcb39ff393bfa394a482b50e7a74e10'/>
<id>7a699899bbcb39ff393bfa394a482b50e7a74e10</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge request from Antonela</title>
<updated>2020-11-24T17:59:01+00:00</updated>
<author>
<name>hiro</name>
<email>hiro@torproject.org</email>
</author>
<published>2020-11-24T17:59:01+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.torproject.org/project/web/dev.git/commit/?id=cf513d6c57fe48fd4badc372bfe753d3853671e8'/>
<id>cf513d6c57fe48fd4badc372bfe753d3853671e8</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Update content structure based on discussion </title>
<updated>2020-11-24T13:53:27+00:00</updated>
<author>
<name>antonela</name>
<email>antonela@torproject.org</email>
</author>
<published>2020-11-24T13:53:27+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.torproject.org/project/web/dev.git/commit/?id=6e64a7660f0b98536be337d8c5338a3566452c01'/>
<id>6e64a7660f0b98536be337d8c5338a3566452c01</id>
<content type='text'>
https://gitlab.torproject.org/tpo/web/dev/-/issues/6
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
https://gitlab.torproject.org/tpo/web/dev/-/issues/6
</pre>
</div>
</content>
</entry>
<entry>
<title>First content skeleton</title>
<updated>2020-07-22T19:20:58+00:00</updated>
<author>
<name>antonela</name>
<email>antonela@torproject.org</email>
</author>
<published>2020-07-22T19:20:58+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.torproject.org/project/web/dev.git/commit/?id=a074e41776ea010b6ef5fb4f1ee6c7b7a8c08ceb'/>
<id>a074e41776ea010b6ef5fb4f1ee6c7b7a8c08ceb</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>kondo clean out</title>
<updated>2020-07-22T12:53:52+00:00</updated>
<author>
<name>antonela</name>
<email>antonela@torproject.org</email>
</author>
<published>2020-07-22T12:53:52+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.torproject.org/project/web/dev.git/commit/?id=24c79b5613f0d9ecdb86a29bf17c36403759c09c'/>
<id>24c79b5613f0d9ecdb86a29bf17c36403759c09c</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Change readme</title>
<updated>2020-07-09T13:55:26+00:00</updated>
<author>
<name>hiro</name>
<email>hiro@torproject.org</email>
</author>
<published>2020-07-09T13:55:26+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.torproject.org/project/web/dev.git/commit/?id=a26dc2a594945d2c4d835ad642c0abf7ea9d54a5'/>
<id>a26dc2a594945d2c4d835ad642c0abf7ea9d54a5</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Change readme</title>
<updated>2020-07-08T13:12:06+00:00</updated>
<author>
<name>hiro</name>
<email>hiro@torproject.org</email>
</author>
<published>2020-07-08T13:12:06+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.torproject.org/project/web/dev.git/commit/?id=3cdac36c569fc93a1ddd841ebb7f99b945fd6819'/>
<id>3cdac36c569fc93a1ddd841ebb7f99b945fd6819</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
