Charles Hacskaylo f3bd88837f Merge remote-tracking branch 'origin/master' into search1093-b ... Conflicts: platform/search/res/templates/search.html		2016-08-08 17:51:39 -07:00
..
search-item.html	[Documentation] Updated copyright statement. Fixes #1081	2016-07-12 16:55:57 -07:00
search-menu.html	[search] Reverted previous change to ClickAwayController and introduced a custom fix to search menu. Fixes #888 (#1109)	2016-08-05 16:30:20 -07:00
search.html	Merge remote-tracking branch 'origin/master' into search1093-b	2016-08-08 17:51:39 -07:00