Commit b4d41184 authored by Thomas Citharel's avatar Thomas Citharel 🏃🏻
Browse files

Merge branch 'update-timeline' into 'master'

Add peertube release

See merge request framasoft/degooglisons!126
parents 8cba5b14 4f539581
Pipeline #85964 passed with stage
in 2 minutes and 34 seconds
......@@ -341,6 +341,7 @@ timeline:
- ['frama', '2017-11-22']
- ['services', '2018-4-3']
- ['services', '2018-5-3']
- ['frama', '2018-10-15']
editors:
icons:
......
......@@ -571,6 +571,7 @@ timeline:
- '<a href="https://framablog.org/2017/11/22/framatube-aidez-nous-a-briser-lhegemonie-de-youtube/">@:timeline.announce PeerTube</a>'
- '<a href="https://framablog.org/2018/04/03/framaclic-un-nouveau-service-qui-compte/">@:timeline.launch Framaclic</a>'
- '<a href="https://framablog.org/2018/05/03/storify-est-mort-longue-vie-a/">@:timeline.launch Framastory</a>'
- '<a href="https://framablog.org/2018/10/15/peertube-1-0-la-plateforme-de-videos-libre-et-federee">@:timeline.launch Peertube 1.0</a>'
# Generic text ---------------------------------------------------------
txt:
......
......@@ -647,6 +647,7 @@ timeline:
- '<a href="https://framablog.org/2017/11/22/framatube-aidez-nous-a-briser-lhegemonie-de-youtube/">@:timeline.announce PeerTube</a>'
- '<a href="https://framablog.org/2018/04/03/framaclic-un-nouveau-service-qui-compte/">@:timeline.launch Framaclic</a>'
- '<a href="https://framablog.org/2018/05/03/storify-est-mort-longue-vie-a/">@:timeline.launch Framastory</a>'
- '<a href="https://framablog.org/2018/10/15/peertube-1-0-la-plateforme-de-videos-libre-et-federee">@:timeline.launch Peertube 1.0</a>'
txt:
play: Play
pause: Pause
......
......@@ -586,6 +586,7 @@ timeline:
- '<a href="https://framablog.org/2017/11/22/framatube-aidez-nous-a-briser-lhegemonie-de-youtube/">@:timeline.announce PeerTube</a>'
- '<a href="https://framablog.org/2018/04/03/framaclic-un-nouveau-service-qui-compte/">@:timeline.launch Framaclic</a>'
- '<a href="https://framablog.org/2018/05/03/storify-est-mort-longue-vie-a/">@:timeline.launch Framastory</a>'
- '<a href="https://framablog.org/2018/10/15/peertube-1-0-la-plateforme-de-videos-libre-et-federee">@:timeline.launch Peertube 1.0</a>'
# Generic text ---------------------------------------------------------
txt:
......
Markdown is supported
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