Skip to content
This repository was archived by the owner on Mar 3, 2020. It is now read-only.

Merge /master onto /dev #543

Merged
merged 25 commits into from
Aug 5, 2017
Merged

Merge /master onto /dev #543

Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
f9f69a7
add hindi translation
Akhil09 Oct 14, 2016
c5a3eb2
added hindi translation
Akhil09 Oct 14, 2016
6bf8317
Update lang_hi.php
Akhil09 Feb 15, 2017
f19b5d5
Merge pull request #454 from Akhil09/master
juliannagler Feb 15, 2017
de72b28
Error Checking During Build Tests (#452)
justinwray Feb 16, 2017
8e4151e
HHVM/Hack Typing Error Fixes (#450)
justinwray Feb 16, 2017
c2957d7
Require bxslider version 4.2.6 (Fixes #455) (#458)
justinwray Feb 17, 2017
899ab2b
Fixed Syntax Errors in Hindi Language (Fixes Build Errors) (#460)
justinwray Feb 17, 2017
ca40091
Automated Game Start and Stop (#449)
justinwray Feb 21, 2017
be35c6b
Attachments and Links Import/Export, Database Restore, and Control Cl…
justinwray Feb 21, 2017
8d1db8c
Update README.md
juliannagler Mar 14, 2017
8f16141
Update README.md
juliannagler Mar 17, 2017
53a6fa7
Update README.md
juliannagler Mar 17, 2017
300091c
Update README.md
juliannagler Mar 17, 2017
0b7ca09
Live Sync API (#459)
justinwray Mar 21, 2017
d326564
I think its bad (#446)
shargon Mar 21, 2017
e880251
Updated LiveSync Security (#494)
justinwray May 8, 2017
dd3c874
Temp fix for issue 499 & 500. Forcing Grunt to continue as it is not…
wisco24 May 18, 2017
51e06a7
Merge Deconflict of /dev and /master (#503)
justinwray May 19, 2017
b11322e
Added Slack registration link to README
gsingh93 Aug 2, 2017
7f8c281
Merge branch 'dev' into merge
justinwray Aug 5, 2017
e181da2
Fixed conflict in ScoreLog
justinwray Aug 5, 2017
dd9de6e
Fixed conflict in ScoreLog
justinwray Aug 5, 2017
f7c6439
Fixed conflict in Control
justinwray Aug 5, 2017
3047351
Merge /dev/ to /master (#542)
justinwray Aug 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,11 @@ You’ve used it, now you want to make it better? Awesome! Pull requests are wel

Facebook also has [bug bounty program](https://www.facebook.com/whitehat/) that includes FBCTF. If you find a security vulnerability in the platform, please submit it via the process outlined on that page and do not file a public issue.

Feel free to join our slack by registering your email here: https://fbctf-slack.herokuapp.com/

## Have more questions?

Check out the [wiki pages](https://github.com/facebook/fbctf/wiki) attached to this repo.
Check out the [wiki pages](https://github.com/facebook/fbctf/wiki) attached to this repo. You can also ask on Slack by registering your email here: https://fbctf-slack.herokuapp.com/.

## License

Expand Down