/**
 * @author a.demeshko
 * created on 1/12/16
 */
(function () {
  'use strict';

  angular.module('BlurAdmin.pages.timeline', [])
    .config(routeConfig);

  /** @ngInject */
  function routeConfig($stateProvider) {
    $stateProvider
      .state('timeline', {
        url: '/timeline',
        templateUrl: 'app/pages/timeline/timeline.html'
      });
  }
})();
@@ -340,16 +340,143 @@
 ne.html'
+,%0A          title: 'Timeline',%0A          sidebarMeta: %7B%0A            icon: 'ion-ios-pulse',%0A            order: 650,%0A          %7D,
 %0A      %7D

add timeline to the sidebar, fix after merge