Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FED issue #1 [r=arikfr] #47

Merged
merged 3 commits into from
Dec 31, 2013
Merged

FED issue #1 [r=arikfr] #47

merged 3 commits into from
Dec 31, 2013

Conversation

amirnissim
Copy link
Contributor

No description provided.

$routeProvider.when('/admin/status', {templateUrl: '/views/admin_status.html', controller: 'AdminStatusCtrl'});
$routeProvider.when('/', {templateUrl: '/views/index.html', controller: 'IndexCtrl'});
$routeProvider.otherwise({redirectTo: '/'});
growlProvider.globalTimeToLive(2000);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the only real change in this file (everything else is whitespace)

arikfr added a commit that referenced this pull request Dec 31, 2013
@arikfr arikfr merged commit 9113233 into master Dec 31, 2013
@amirnissim amirnissim deleted the fed-issue1 branch January 7, 2014 09:29
christophervalles pushed a commit to hailocab/redash that referenced this pull request May 8, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants