From 37f7da63c7847bfd127e7d521f443903c8c9b3ea Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 4 Apr 2016 22:27:35 +0200 Subject: [PATCH] fix conflict --- README.rst | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/README.rst b/README.rst index a39b5ff2..d07ee7df 100644 --- a/README.rst +++ b/README.rst @@ -2,6 +2,9 @@ Collaborative multimedia asset management system ================================================= +.. image:: /images/logo_telemeta_2.png + :alt: Telemeta logo + Overview ========= @@ -71,6 +74,8 @@ News 1.6 ++++ +Telemeta is now usable on any OS, ready for development and for production use cases in 5 mn! B-) + * Provide a docker image and composition for the full Telemeta application bundle. One month after the publication of docker-compose around march 2015, we had managed to build a prototyped composition which bundled all the dependencies of Telemeta and TimeSide. It took almost one year to deeply investigate all the capabilities of Docker and various images to finally release a propoer composition which bundles all the necessary applications and modules. So we can say that Telemeta is now usable on **any OS** in 5 mn! B-) @@ -83,12 +88,6 @@ News * Switch to Affero GPL licence * Upgrade of every dependency bundle in the composition * Many, many `bugfixes `_ - -======= -Telemeta is now usable on any OS, ready for development and for production use cases in 5 mn! B-) - -* Provide a docker image and composition for the full Telemeta application bundle including more useful modules and apps. ->>>>>>> doc * Thanks to all partners for this **huge** release! 1.5.1 -- 2.39.5