Sven Fuchs 300e91133c Merge branch 'master' into sf-log ... Conflicts: assets/scripts/app/views/log.coffee		2013-03-22 02:14:55 +01:00
..
app	Merge branch 'master' into sf-log	2013-03-22 02:14:55 +01:00
config	We can remove locales.js, it will be created on compilation on heroku	2012-12-17 22:17:04 +01:00
data	Add BusyConf as sponsor.	2013-03-14 17:36:55 +01:00
lib	Merge branch 'master' into sf-log	2013-03-22 02:14:55 +01:00
spec	Improve log handling	2013-03-22 01:25:23 +01:00
vendor	update log.js	2013-03-17 22:40:09 +01:00
travis.coffee	Keep application class at TravisApplication and move it to separate file	2013-03-20 00:00:05 +01:00