twconquest 24df32ba7f Merge upstream/dev into show-roles and re-add myself to CONTRIBUTORS.md ...

Conflicts:
	CONTRIBUTORS.md

2015-08-17 17:48:50 +00:00

..

assets

Merge pull request #783 from pozorvlak/remove_last_count_calls

2015-08-05 18:57:04 +01:00

controllers

Resolved #562 - Pagination of notifications.

2015-07-25 13:18:30 -04:00

helpers

Merge branch 'pr/782' into dev

2015-07-24 11:09:35 +01:00

mailers

Check existence of secret token before using it.

2015-07-24 15:16:31 +01:00

models

Revert "Merge pull request #775 from pozorvlak/speed_up_homepage"

2015-08-06 10:56:46 +00:00

validators

tests back to green

2015-02-09 22:41:35 +11:00

views

Merge upstream/dev into show-roles and re-add myself to CONTRIBUTORS.md

2015-08-17 17:48:50 +00:00