Commit 65126bd4 authored by Antonela's avatar Antonela 🔮
Browse files

Merge branch 'master' into 'master'

rebase

See merge request !4
parents 9ebe6f85 b8e468f1
...@@ -12,8 +12,7 @@ or browse it [online](http://gitweb.torproject.org/project/web/tpo.git). ...@@ -12,8 +12,7 @@ or browse it [online](http://gitweb.torproject.org/project/web/tpo.git).
## How to report bugs or feedback ## How to report bugs or feedback
First check if your issue wasn't already opened in [dip.torproject.org](https://dip.torproject.org/web/tpo/issues), then file a [trac ticket](https://trac.torproject.org/projects/tor/newticket) and choose the component: Webpages/Website. First, check if the bug is already known. You can search and read all the issues at https://gitlab.torproject.org/. To create a new issue, please [request a new account](https://gitlab.onionize.space/) to access Tor Project's GitLab instance and [find the right repository](https://gitlab.torproject.org/tpo) to report your issue. Issues related to our websites should be filed under the [Web issue tracker](https://gitlab.torproject.org/groups/tpo/web/-/issues).
## What is Lektor ## What is Lektor
...@@ -51,7 +50,7 @@ To just build the website once: ```$ lektor build -O <folder>``` ...@@ -51,7 +50,7 @@ To just build the website once: ```$ lektor build -O <folder>```
#### How to develop on the website #### How to develop on the website
Check our [wiki pages](https://dip.torproject.org/web/community/wikis/How-to-develop-on-the-website). Check our [wiki pages](https://gitlab.torproject.org/web/community/wikis/How-to-develop-on-the-website).
### Translations ### Translations
......
...@@ -32,7 +32,7 @@ language = Español (es) ...@@ -32,7 +32,7 @@ language = Español (es)
[fa] [fa]
url = /fa/ url = /fa/
language = Farsi (fa) language = فارسی (fa)
[fr] [fr]
url = /fr/ url = /fr/
......
...@@ -36,7 +36,7 @@ language = Español Arg. (es-AR) ...@@ -36,7 +36,7 @@ language = Español Arg. (es-AR)
[fa] [fa]
url = /fa/ url = /fa/
language = Farsi (fa) language = فارسی (fa)
[fr] [fr]
url = /fr/ url = /fr/
......
...@@ -12,7 +12,7 @@ version = 10.0a6 ...@@ -12,7 +12,7 @@ version = 10.0a6
version = 10.0a6 version = 10.0a6
[tor-stable] [tor-stable]
version = 0.4.3.6 version = 0.4.4.5
[tor-alpha] [tor-alpha]
version = 0.4.4.4-rc version = 0.4.4.4-rc
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment