Permalink
Browse files

Merge branch 'staging' into dev

Conflicts:
	bin/dev-sentry.sh
  • Loading branch information...
2 parents 872e11e + 78e74ba commit f975e1ea15a369f86a7597c185bfcc7da8acca10 @honza honza committed Dec 11, 2012
Showing with 0 additions and 3 deletions.
  1. +0 −3 bin/dev-sentry.sh
View
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-sentry --config=sentry.dev.conf.py start

0 comments on commit f975e1e

Please sign in to comment.