Merge branch 'stable'

Browse Source

Conflicts:
	CHANGELOG.md
	app/coffee/modules/backlog/main.coffee
	app/coffee/modules/controllerMixins.coffee
	app/coffee/modules/resources/issues.coffee
	app/coffee/modules/resources/tasks.coffee
	app/coffee/modules/resources/userstories.coffee
	app/coffee/modules/taskboard/main.coffee
	app/coffee/modules/wiki/main.coffee
	app/partials/taskboard.jade
	app/styles/components/loader.scss
	app/styles/components/loading-bar.scss
	app/styles/layout/animation.scss
	app/styles/layout/base.scss
	app/styles/layout/issues.scss

stable

Jesús Espino 2015-01-29 12:02:10 +01:00

parent 8593f44cbc 942ec5bca0

commit c9ec4d9261

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available