Merge branch 'feature_user_to_users'

Antti Karjalainen · Antti Karjalainen · commit ef36082e09bb · 2018-09-19T09:10:31.000+02:00
# Conflicts:
#	index.html
#	sources/src/App.vue
diff --git a/index.html b/index.html
@@ -11,4 +11,4 @@
     })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
 
     ga('create', 'UA-106835747-2', 'auto');
-    ga('send', 'pageview');</script><title>Robot Framework</title><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name=description content="Generic test automation framework for acceptance testing and ATDD"><meta name=author content=""><link rel=apple-touch-icon sizes=76x76 href=/static/img/icons/apple-touch-icon.png><link rel=icon type=image/png sizes=32x32 href=/static/img/icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=/static/img/icons/favicon-16x16.png><link rel=manifest href=/static/img/icons/site.webmanifest><link rel=mask-icon href=/static/img/icons/safari-pinned-tab.svg color=#5bbad5><meta name=msapplication-TileColor content=#da532c><meta name=theme-color content=#ffffff><link href=/static/css/app.8d1414f48f3e76d4697f72bc1dbc10d6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.14a76fad9b304f57d579.js></script><script type=text/javascript src=/static/js/vendor.2efd2cdea7175353f657.js></script><script type=text/javascript src=/static/js/app.df8fe5b6915950f29a74.js></script></body></html>
+    ga('send', 'pageview');</script><title>Robot Framework</title><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name=description content="Generic test automation framework for acceptance testing and ATDD"><meta name=author content=""><link rel=apple-touch-icon sizes=76x76 href=/static/img/icons/apple-touch-icon.png><link rel=icon type=image/png sizes=32x32 href=/static/img/icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=/static/img/icons/favicon-16x16.png><link rel=manifest href=/static/img/icons/site.webmanifest><link rel=mask-icon href=/static/img/icons/safari-pinned-tab.svg color=#5bbad5><meta name=msapplication-TileColor content=#da532c><meta name=theme-color content=#ffffff><link href=/static/css/app.8d1414f48f3e76d4697f72bc1dbc10d6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.14a76fad9b304f57d579.js></script><script type=text/javascript src=/static/js/vendor.2efd2cdea7175353f657.js></script><script type=text/javascript src=/static/js/app.6d865dd96857bfd647c2.js></script></body></html>
diff --git a/sources/src/App.vue b/sources/src/App.vue
@@ -1204,6 +1204,13 @@ export default {
                 text:
                   'Kistler is using the Robot Framework for automated system tests of backend and frontend applications for various, very accurate and highly precise <a href="https://www.kistler.com/en/products/systems/" target="_blank">measurement systems</a>.'
               },
+              {
+                title: "Rocla",
+                href: "http://rocla.com/",
+                img: require("@/assets/img/users/rocla.png"),
+                text:
+                  "Rocla is using Robot Framework widely in development and testing of the software for Trucks and Automated Guided Vehicles (AGV’s)."
+              },
               {
                 title: "salicru",
                 href: "http://www.salicru.com",
diff --git a/static/js/app.6d865dd96857bfd647c2.js b/static/js/app.6d865dd96857bfd647c2.js
