Tim Daubenschütz d4de2434ee Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh ... Conflicts: js/components/ascribe_forms/form_share_email.js js/components/ascribe_forms/form_transfer.js js/utils/general_utils.js sass/main.scss		2015-10-22 13:38:49 +02:00
..
actions	Merged in AD-727-missing-redirects-to-login-page (pull request #95)	2015-10-19 10:13:54 +02:00
components	Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh	2015-10-22 13:38:49 +02:00
constants	Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh	2015-10-20 18:11:41 +02:00
fetchers
mixins
models
stores	Merge remote-tracking branch 'remotes/origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity	2015-10-14 17:25:53 +02:00
third_party
utils	Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh	2015-10-22 13:38:49 +02:00
alt.js
app.js
history.js
routes.js	Redirect directly to /login on loggout	2015-10-16 13:01:54 +02:00