Toni Dezman 4034400c42 Merge branch 'decoupling-settings-page' into td_SCI_1565		2017-08-31 11:42:15 +02:00
..
app	Merge branch 'decoupling-settings-page' into td_SCI_1565	2017-08-31 11:42:15 +02:00
locales	added pagination and sorting to team tables	2017-08-28 17:05:09 +02:00
shared	Merge branch 'decoupling-settings-page' into td_SCI_1565	2017-08-31 11:42:15 +02:00
src/settings	Merge branch 'decoupling-settings-page' into td_SCI_1565	2017-08-31 11:42:15 +02:00
styles	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1493_v3	2017-08-25 08:58:20 +02:00