again this pesky repetition
minor merge issue
Merge branch 'dev' of github.com:grujic/tnt into dev
Merge branch 'dev' of github.com:grujic/tnt into dev
Merge branch 'dev' of github.com:grujic/tnt into dev
Merge branch 'dev' of github.com:grujic/tnt into dev
Changed the Calculation model in the api app a little on the server - urgh going to get merge issues until I sort out how migrations work properly
Merge branch 'dev' of github.com:grujic/tnt into dev
put main.js in collected static on server
minor merge issue
Merge branch 'dev' of github.com:grujic/tnt into dev
Merge branch 'dev' of github.com:grujic/tnt into dev
Merge branch 'dev' of github.com:grujic/tnt into dev
Fixed merges
Merge branch 'dev' of github.com:grujic/tnt into dev
Merge branch 'dev' of github.com:grujic/tnt into dev
Merge branch 'dev' of github.com:grujic/tnt into dev
Minor merge issue
Ah yes the merges in collectedstatic I never understood